facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

tests_: fix failures related to recent renames

Browse Source 
Summary: We need to start fixing test failures to test hgbuild e2e :)

Test Plan: run-tests.py against changed files shows that these ones were fixed

Reviewers: quark, mjpieters, rmcelroy, simonfar

Subscribers: mjpieters, #sourcecontrol

Differential Revision: https://phabricator.intern.facebook.com/D3907217
This commit is contained in:
Kostia Balytskyi 2016-09-22 07:44:34 -07:00
parent d62504e76d
commit ded4c889ca
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/test-backup.t
View File

@ -22,17 +22,17 @@ Test backups list and recover
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d2ae7f538514-2953539b-backup.hg (glob) saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d2ae7f538514-2953539b-backup.hg (glob)
$ hg backups $ hg backups
Recover commits using: hg backups --recover <commit hash> Recover changesets using: hg backups --recover <changeset hash>
* (glob) * (glob)
d2ae7f538514 b d2ae7f538514 b
$ hg backups --config experimental.evolution=createmarkers $ hg backups --config experimental.evolution=createmarkers
Marker creation is enabled so no commit should be Marker creation is enabled so no changeset should be
* (glob) * (glob)
stripped commits. If you are trying to recover a commit hidden from a previous stripped changesets. If you are trying to recover a changeset hidden from a
command, use hg journal to get its sha1 and you will be able to access it previous command, use hg journal to get its sha1 and you will be able to access
directly without recovering a backup.Recover commits using: hg backups --recover <commit hash> it directly without recovering a backup.Recover changesets using: hg backups --recover <changeset hash>
* (glob) * (glob)
d2ae7f538514 b d2ae7f538514 b

10
tests/test-diff-since-last-arc-diff.t
View File

@ -16,7 +16,7 @@ Diff with no revision
$ hg add foo $ hg add foo
$ hg ci -qm 'No rev' $ hg ci -qm 'No rev'
$ hg diff --since-last-arc-diff $ hg diff --since-last-arc-diff
abort: local commit is not associated with a differential revision abort: local changeset is not associated with a differential revision
[255] [255]
Fake a diff Fake a diff
@ -38,14 +38,14 @@ Now progressively test the response handling for variations of missing data
> [{"cmd": ["differential.query", {"ids": ["1"]}], "result": null}] > [{"cmd": ["differential.query", {"ids": ["1"]}], "result": null}]
> EOF > EOF
$ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff $ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff
abort: unable to determine previous commit hash abort: unable to determine previous changeset hash
[255] [255]
$ cat > $TESTTMP/mockduit << EOF $ cat > $TESTTMP/mockduit << EOF
> [{"cmd": ["differential.query", {"ids": ["1"]}], "result": [{"diffs": []}]}] > [{"cmd": ["differential.query", {"ids": ["1"]}], "result": [{"diffs": []}]}]
> EOF > EOF
$ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff $ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff
abort: unable to determine previous commit hash abort: unable to determine previous changeset hash
[255] [255]
$ cat > $TESTTMP/mockduit << EOF $ cat > $TESTTMP/mockduit << EOF
@ -57,7 +57,7 @@ Now progressively test the response handling for variations of missing data
> }] > }]
> EOF > EOF
$ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff $ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff
abort: unable to determine previous commit hash abort: unable to determine previous changeset hash
[255] [255]
$ cat > $TESTTMP/mockduit << EOF $ cat > $TESTTMP/mockduit << EOF
@ -69,7 +69,7 @@ Now progressively test the response handling for variations of missing data
> }] > }]
> EOF > EOF
$ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff $ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff
abort: unable to determine previous commit hash abort: unable to determine previous changeset hash
[255] [255]
This is the case when the diff is up to date with the current commit; This is the case when the diff is up to date with the current commit;

2
tests/test-mergedriver.t
View File

@ -361,7 +361,7 @@ XXX shouldn't output a warning
ancestor path: foo.txt (node ad59c7ac23656632da079904d4d40d0bab4aeb80) ancestor path: foo.txt (node ad59c7ac23656632da079904d4d40d0bab4aeb80)
other path: foo.txt (node 0b0743b512ba9b7c5db411597cf374a73b9f00ac) other path: foo.txt (node 0b0743b512ba9b7c5db411597cf374a73b9f00ac)
$ hg commit -m 'merged' $ hg commit -m 'merged'
abort: unresolved merge conflicts (see "hg help resolve") abort: unresolved merge conflicts (see 'hg help resolve')
[255] [255]
$ hg update 2 $ hg update 2
abort: outstanding uncommitted merge abort: outstanding uncommitted merge

4
tests/test-pull-createmarkers-hide-later.t
View File

@ -85,7 +85,7 @@ when a diff is landed with landcastle.
$ hg push -r . --to master $ hg push -r . --to master
pushing rev cc68f5e5f8d6 to destination ssh://user@dummy/server bookmark master pushing rev cc68f5e5f8d6 to destination ssh://user@dummy/server bookmark master
searching for changes searching for changes
remote: pushing 2 commits: remote: pushing 2 changsets:
remote: e0672eeeb97c add b remote: e0672eeeb97c add b
remote: cc68f5e5f8d6 add c remote: cc68f5e5f8d6 add c
updating bookmark master updating bookmark master
@ -145,7 +145,7 @@ Now land the last diff.
$ hg push -r . --to master $ hg push -r . --to master
pushing rev 296f9d37d5c1 to destination ssh://user@dummy/server bookmark master pushing rev 296f9d37d5c1 to destination ssh://user@dummy/server bookmark master
searching for changes searching for changes
remote: pushing 1 commit: remote: pushing 1 changset:
remote: 296f9d37d5c1 add d remote: 296f9d37d5c1 add d
updating bookmark master updating bookmark master

6
tests/test-pull-createmarkers.t
View File

@ -60,7 +60,7 @@ The first client works on several diffs while the second client lands one of her
$ hg push --to master $ hg push --to master
pushing rev 2e73b79a63d8 to destination ssh://user@dummy/server bookmark master pushing rev 2e73b79a63d8 to destination ssh://user@dummy/server bookmark master
searching for changes searching for changes
remote: pushing 1 commit: remote: pushing 1 changset:
remote: 2e73b79a63d8 add b remote: 2e73b79a63d8 add b
updating bookmark master updating bookmark master
$ cd ../client $ cd ../client
@ -84,11 +84,11 @@ The first client works on several diffs while the second client lands one of her
$ hg push --to master $ hg push --to master
pushing rev d5895ab36037 to destination ssh://user@dummy/server bookmark master pushing rev d5895ab36037 to destination ssh://user@dummy/server bookmark master
searching for changes searching for changes
remote: pushing 3 commits: remote: pushing 3 changsets:
remote: 1a07332e9fa1 add c remote: 1a07332e9fa1 add c
remote: ee96b78ae17d add d remote: ee96b78ae17d add d
remote: d5895ab36037 add e remote: d5895ab36037 add e
remote: 4 new commits from the server will be downloaded remote: 4 new changesets from the server will be downloaded
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes

4
tests/test-show.t
View File

@ -271,7 +271,7 @@ Confirm that --help works (it didn't when we used an alias)
See 'hg help templates' for more about pre-packaged styles and specifying See 'hg help templates' for more about pre-packaged styles and specifying
custom templates. custom templates.
(use "hg help -e show" to show help for the show extension) (use 'hg help -e show' to show help for the show extension)
options ([+] can be repeated): options ([+] can be repeated):
@ -294,7 +294,7 @@ Confirm that --help works (it didn't when we used an alias)
See 'hg help templates' for more about pre-packaged styles and specifying See 'hg help templates' for more about pre-packaged styles and specifying
custom templates. custom templates.
(use "hg help -e show" to show help for the show extension) (use 'hg help -e show' to show help for the show extension)
options ([+] can be repeated): options ([+] can be repeated):

2
tests/test-sqldirstate-shelve.t
View File

@ -55,7 +55,7 @@ shelve has a help message
To delete specific shelved changes, use "--delete". To delete all shelved To delete specific shelved changes, use "--delete". To delete all shelved
changes, use "--cleanup". changes, use "--cleanup".
(use "hg help -e shelve" to show help for the shelve extension) (use 'hg help -e shelve' to show help for the shelve extension)
options ([+] can be repeated): options ([+] can be repeated):