This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1935

tests: update test to work with Git 2.16
ClosedPublic

Authored by indygreg on Jan 22 2018, 3:38 PM.

Details

Reviewers
spectral
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG8144f1b07e21: tests: update test to work with Git 2.16
Summary

It looks like Git 2.16 removed the "..." from some strings.
Glob over those characters in the test output.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Jan 22 2018, 3:38 PM
spectral accepted this revision.Jan 22 2018, 3:46 PM
spectral added a subscriber: spectral.

I've also been seeing these failures, thanks!

martinvonz accepted this revision.Jan 22 2018, 3:51 PM
This revision is now accepted and ready to land.Jan 22 2018, 3:51 PM
Closed by commit rHG8144f1b07e21: tests: update test to work with Git 2.16 (authored by indygreg). · Explain WhyJan 22 2018, 3:55 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-subrepo-git.t (12 lines)

Diff 4992

tests/test-subrepo-git.t

$ cd ../td/s $ cd ../td/s
$ git remote set-url origin $TESTTMP/tb/s $ git remote set-url origin $TESTTMP/tb/s
$ git branch --no-track oldtesting $ git branch --no-track oldtesting
$ cd .. $ cd ..
$ hg pull -q ../tb $ hg pull -q ../tb
$ hg up $ hg up
From $TESTTMP/tb/s From $TESTTMP/tb/s
* [new branch] b2 -> origin/b2 * [new branch] b2 -> origin/b2
Previous HEAD position was f47b465... merge Previous HEAD position was f47b465* merge (glob)
Switched to a new branch 'b2' Switched to a new branch 'b2'
pulling subrepo s from $TESTTMP/tb/s pulling subrepo s from $TESTTMP/tb/s
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
update to a revision without the subrepo, keeping the local git repository update to a revision without the subrepo, keeping the local git repository
$ cd ../t $ cd ../t
$ hg up 0 $ hg up 0
$ hg id -n $ hg id -n
7 7
$ cd s $ cd s
$ git rev-parse HEAD $ git rev-parse HEAD
32a343883b74769118bb1d3b4b1fbf9156f4dddc 32a343883b74769118bb1d3b4b1fbf9156f4dddc
$ cd .. $ cd ..
$ cd s $ cd s
$ git checkout aa84837ccfbdfedcdcdeeedc309d73e6eb069edc $ git checkout aa84837ccfbdfedcdcdeeedc309d73e6eb069edc
Previous HEAD position was 32a3438... fff Previous HEAD position was 32a3438* fff (glob)
HEAD is now at aa84837... f HEAD is now at aa84837* f (glob)
$ cd .. $ cd ..
$ hg update 1 $ hg update 1
subrepository s diverged (local revision: 32a3438, remote revision: da5f5b1) subrepository s diverged (local revision: 32a3438, remote revision: da5f5b1)
(M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m
subrepository sources for s differ (in checked out version) subrepository sources for s differ (in checked out version)
use (l)ocal source (32a3438) or (r)emote source (da5f5b1)? l use (l)ocal source (32a3438) or (r)emote source (da5f5b1)? l
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg id -n $ hg id -n
$ cd s $ cd s
$ git rev-parse HEAD $ git rev-parse HEAD
32a343883b74769118bb1d3b4b1fbf9156f4dddc 32a343883b74769118bb1d3b4b1fbf9156f4dddc
$ cd .. $ cd ..
Test subrepo already at intended revision: Test subrepo already at intended revision:
$ cd s $ cd s
$ git checkout 32a343883b74769118bb1d3b4b1fbf9156f4dddc $ git checkout 32a343883b74769118bb1d3b4b1fbf9156f4dddc
HEAD is now at 32a3438... fff HEAD is now at 32a3438* fff (glob)
$ cd .. $ cd ..
$ hg update 1 $ hg update 1
Previous HEAD position was 32a3438... fff Previous HEAD position was 32a3438* fff (glob)
HEAD is now at da5f5b1... g HEAD is now at da5f5b1* g (glob)
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg id -n $ hg id -n
1 1
$ cd s $ cd s
$ git rev-parse HEAD $ git rev-parse HEAD
da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7
$ cd .. $ cd ..