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

tests: enable narrow-heads for more Python tests

Browse Source 
Summary: Migrate some Python tests to use narrow-heads.

Reviewed By: DurhamG

Differential Revision: D22130167

fbshipit-source-id: 5cc71711b5bc674daed5040909e7cd141b7a9cfc
This commit is contained in:
Jun Wu 2020-07-02 13:11:57 -07:00 committed by Facebook GitHub Bot
parent 5c567018c8
commit f1afaa9ae4
14 changed files with 96 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
eden/scm/tests/features.py
View File

@ -44,22 +44,9 @@ narrowheadsincompatiblelist = """
test-revset2.t
test-visibility.t
test-absorb-phase-t.py
test-bookmark-strip-t.py
test-command-template-t.py
test-fb-hgext-remotefilelog-commit-repack-t.py
test-fb-hgext-reset-t.py
test-fb-hgext-smartlog-remotenames-t.py
test-fb-hgext-tweakdefaults-pullrebaseffwd-t.py
test-graft-t.py
test-log-t.py
test-pull-update-t.py
test-rebase-check-restore-t.py
test-remotenames-strip-t.py
test-globalrevs-t.py
test-hgsql-local-commands-t.py
test-revset-t.py
test-shelve-t.py
"""

5
eden/scm/tests/test-absorb-phase-t.py
View File

@ -22,8 +22,7 @@ B
A
"""
sh % "hg phase -r A --public -q"
sh % "hg phase -r C --secret --force -q"
sh % "hg debugmakepublic -r A"
sh % "hg update C -q"
sh % "printf B1" > "B"
@ -31,7 +30,7 @@ sh % "printf B1" > "B"
sh % "hg absorb -aq"
sh % "hg log -G -T '{desc} {phase}'" == r"""
@ C secret
@ C draft
|
o B draft
|

6
eden/scm/tests/test-bookmark-strip-t.py
View File

@ -8,8 +8,6 @@ from __future__ import absolute_import
from testutil.dott import feature, sh, testtmp # noqa: F401
# Test bookmark -D
sh % "hg init book-D"
sh % "cd book-D"
@ -46,11 +44,11 @@ sh % "hg bookmark -D feature1" == r"""
sh % "hg log -G -T '{rev} {bookmarks}' -r 'all()' --hidden" == r"""
o 6 feature2
|
| x 5
| o 5
| |
o | 4
| |
| x 3
| o 3
|/
o 2
|

21
eden/scm/tests/test-command-template-t.py
View File

@ -1142,12 +1142,11 @@ sh % "cat" << r"""
changeset_debug = '{rev} ({phase}):{parents}\n'
parent = ' {rev} ({phase})'
""" > "parentphase"
sh % "hg phase -r 5 --public"
sh % "hg phase -r 7 --secret --force"
sh % "hg debugmakepublic 5"
sh % "hg log --debug -G --style ./parentphase" == r"""
@ 8 (secret): 7 (secret) -1 (public)
@ 8 (draft): 7 (draft) -1 (public)
|
o 7 (secret): -1 (public) -1 (public)
o 7 (draft): -1 (public) -1 (public)
o 6 (draft): 5 (public) 4 (draft)
|\
@ -2113,7 +2112,7 @@ sh % "hg log -T status -C -r 10 -v" == r"""
R fourth"""
sh % "hg log -T status -C -r 10 --debug" == r"""
changeset: 10:0f9759ec227a4859c2014a345cd8a859022b7c6c
phase: secret
phase: draft
parent: 9:bf9dfba36635106d6a73ccc01e28b762da60e066
parent: -1:0000000000000000000000000000000000000000
manifest: 89dd546f2de0a9d6d664f58d86097eb97baba567
@ -2132,7 +2131,7 @@ sh % "hg log -T status -C -r 10 --debug" == r"""
R fourth"""
sh % "hg log -T status -C -r 10 --quiet" == "10:0f9759ec227a"
sh % "hg '--color=debug' log -T status -r 10" == r"""
[log.changeset changeset.secret|changeset: 10:0f9759ec227a]
[log.changeset changeset.draft|changeset: 10:0f9759ec227a]
[log.user|user: test]
[log.date|date: Thu Jan 01 00:00:00 1970 +0000]
[log.summary|summary: Modify, add, remove, rename]
@ -2143,7 +2142,7 @@ sh % "hg '--color=debug' log -T status -r 10" == r"""
[status.removed|R a]
[status.removed|R fourth]"""
sh % "hg '--color=debug' log -T status -C -r 10" == r"""
[log.changeset changeset.secret|changeset: 10:0f9759ec227a]
[log.changeset changeset.draft|changeset: 10:0f9759ec227a]
[log.user|user: test]
[log.date|date: Thu Jan 01 00:00:00 1970 +0000]
[log.summary|summary: Modify, add, remove, rename]
@ -2155,7 +2154,7 @@ sh % "hg '--color=debug' log -T status -C -r 10" == r"""
[status.removed|R a]
[status.removed|R fourth]"""
sh % "hg '--color=debug' log -T status -C -r 10 -v" == r"""
[log.changeset changeset.secret|changeset: 10:0f9759ec227a]
[log.changeset changeset.draft|changeset: 10:0f9759ec227a]
[log.user|user: test]
[log.date|date: Thu Jan 01 00:00:00 1970 +0000]
[ui.note log.description|description:]
@ -2169,9 +2168,9 @@ sh % "hg '--color=debug' log -T status -C -r 10 -v" == r"""
[status.removed|R a]
[status.removed|R fourth]"""
sh % "hg '--color=debug' log -T status -C -r 10 --debug" == r"""
[log.changeset changeset.secret|changeset: 10:0f9759ec227a4859c2014a345cd8a859022b7c6c]
[log.phase|phase: secret]
[log.parent changeset.secret|parent: 9:bf9dfba36635106d6a73ccc01e28b762da60e066]
[log.changeset changeset.draft|changeset: 10:0f9759ec227a4859c2014a345cd8a859022b7c6c]
[log.phase|phase: draft]
[log.parent changeset.draft|parent: 9:bf9dfba36635106d6a73ccc01e28b762da60e066]
[log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000]
[ui.debug log.manifest|manifest: 89dd546f2de0a9d6d664f58d86097eb97baba567]
[log.user|user: test]

2
eden/scm/tests/test-fb-hgext-remotefilelog-commit-repack-t.py
View File

@ -19,7 +19,7 @@ sh % "hgcloneshallow ssh://user@dummy/master client" == r"""
streaming all changes
0 files to transfer, 0 bytes of data
transferred 0 bytes in 0.0 seconds (0 bytes/sec)
no changes found
requesting all changes
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved"""
sh % "cd client"

8
eden/scm/tests/test-fb-hgext-reset-t.py
View File

@ -60,7 +60,6 @@ sh % "hg log -G -T '{node|short} {bookmarks} {phase}\\n'" == r"""
@ 66ee28d0328c foo draft
|
o b292c1e3311f public"""
sh % "hg phase -f -d b292c1e3311f"
# Reset should not strip reachable commits
@ -154,9 +153,10 @@ sh % "hg log -G -T '{node|short} {bookmarks}\\n'" == r"""
sh % "hg reset -C '66ee28d0328c^'" == "2 changesets hidden"
sh % "hg log -r 66ee28d0328c" == r"""
abort: hidden revision '66ee28d0328c'!
(use --hidden to access hidden revisions)
[255]"""
changeset: 1:66ee28d0328c
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: y"""
sh % "hg log -G -T '{node|short} {bookmarks}\\n'" == "@ b292c1e3311f foo"
sh % "hg reset -C 7f3a02b3e388"
sh % "hg log -G -T '{node|short} {bookmarks}\\n'" == r"""

25
eden/scm/tests/test-fb-hgext-smartlog-remotenames-t.py
View File

@ -45,7 +45,10 @@ sh % "hg push --non-forward-move -q --to master"
sh % "hg smartlog -T '{rev} {bookmarks} {remotebookmarks}'" == r"""
@ 2 default/master
|
o 0 mybook"""
o 0 mybook
note: hiding 1 old heads without bookmarks
(use --all to see them)"""
# Test configuration of "interesting" bookmarks
@ -58,13 +61,19 @@ sh % "hg smartlog -T '{rev} {bookmarks} {remotebookmarks}'" == r"""
|
| @ 3 default/project/bookmark
|/
o 0 mybook"""
o 0 mybook
note: hiding 1 old heads without bookmarks
(use --all to see them)"""
sh % "hg up '.^'" == "1 files updated, 0 files merged, 0 files removed, 0 files unresolved"
sh % "hg smartlog -T '{rev} {bookmarks} {remotebookmarks}'" == r"""
o 2 default/master
|
@ 0 mybook"""
@ 0 mybook
note: hiding 1 old heads without bookmarks
(use --all to see them)"""
sh % "cat" << r"""
[smartlog]
repos=default/
@ -73,7 +82,10 @@ names=project/bookmark
sh % "hg smartlog -T '{rev} {bookmarks} {remotebookmarks}'" == r"""
o 3 default/project/bookmark
|
@ 0 mybook"""
@ 0 mybook
note: hiding 1 old heads without bookmarks
(use --all to see them)"""
sh % "cat" << r"""
[smartlog]
names=master project/bookmark
@ -83,4 +95,7 @@ sh % "hg smartlog -T '{rev} {bookmarks} {remotebookmarks}'" == r"""
|
| o 3 default/project/bookmark
|/
@ 0 mybook"""
@ 0 mybook
note: hiding 1 old heads without bookmarks
(use --all to see them)"""

10
eden/scm/tests/test-fb-hgext-tweakdefaults-pullrebaseffwd-t.py
View File

@ -9,8 +9,7 @@ from testutil.dott import feature, sh, testtmp # noqa: F401
sh % "setconfig 'extensions.treemanifest=!'"
# TODO: Make this test compatibile with obsstore enabled.
sh % "setconfig 'experimental.evolution='"
sh.enable("remotenames")
# Set up without remotenames
sh % "cat" << r"""
[extensions]
@ -21,13 +20,14 @@ tweakdefaults=
sh % "hg init repo"
sh % "echo a" > "repo/a"
sh % "hg -R repo commit -qAm a"
sh % "hg -R repo bookmark master"
sh % "hg clone -q repo clone"
sh % "cd clone"
# Pull --rebase with no local changes
sh % "echo b" > "../repo/b"
sh % "hg -R ../repo commit -qAm b"
sh % "hg pull --rebase -d default" == r"""
sh % "hg pull --rebase -d master" == r"""
pulling from $TESTTMP/repo
searching for changes
adding changesets
@ -35,7 +35,7 @@ sh % "hg pull --rebase -d default" == r"""
adding file changes
added 1 changesets with 1 changes to 1 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
nothing to rebase - fast-forwarded to default"""
nothing to rebase - fast-forwarded to master"""
sh % "hg log -G -T '{rev} {desc}'" == r"""
@ 1 b
|
@ -45,7 +45,7 @@ sh % "echo x" > "x"
sh % "hg commit -qAm x"
sh % "echo c" > "../repo/c"
sh % "hg -R ../repo commit -qAm c"
sh % "hg pull --rebase -d default" == r'''
sh % "hg pull --rebase -d master" == r'''
pulling from $TESTTMP/repo
searching for changes
adding changesets

7
eden/scm/tests/test-graft-t.py
View File

@ -48,10 +48,9 @@ sh % "hg ci -m6"
sh % "hg up -qC null"
sh % "hg up -qC tip"
sh % "hg debugmakepublic 3"
sh % "hg phase --force --secret 6"
sh % "hg log -G --template '{author}@{rev}.{phase}: {desc}\\n'" == r"""
@ test@6.secret: 6
@ test@6.draft: 6
|\
| o test@5.draft: 5
| |
@ -243,7 +242,7 @@ sh % "hg summary" == r"""
parent: 9:9436191a062e
5
commit: 2 modified, 2 unknown, 1 unresolved (graft in progress)
phases: 5 draft, 1 secret"""
phases: 6 draft"""
# Using status to get more context
@ -360,7 +359,7 @@ sh % "hg log -G --template '{author}@{rev}.{phase}: {desc}\\n'" == r"""
|
o foo@7.draft: 2
|
| o test@6.secret: 6
| o test@6.draft: 6
| |\
| | o test@5.draft: 5
| | |

28
eden/scm/tests/test-log-t.py
View File

@ -1535,9 +1535,10 @@ sh % "hg log '--template={rev}:{node}\\n' --hidden" == r"""
1:a765632148dc55d38c35c4f247c618701886cb2f
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05"""
sh % "hg log -r a" == r"""
abort: hidden revision 'a'!
(use --hidden to access hidden revisions)
[255]"""
changeset: 1:a765632148dc
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: a bis"""
# test that parent prevent a changeset to be hidden
@ -1584,15 +1585,16 @@ sh % "hg log '-T{rev}:{node}\\n'" == r"""
2:94375ec45bddd2a824535fc04855bd058c926ec0"""
sh % "hg log '-T{rev}:{node}\\n' '-r:'" == r"""
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1:a765632148dc55d38c35c4f247c618701886cb2f
2:94375ec45bddd2a824535fc04855bd058c926ec0
3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e"""
sh % "hg log '-T{rev}:{node}\\n' '-r:tip'" == r"""
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1:a765632148dc55d38c35c4f247c618701886cb2f
2:94375ec45bddd2a824535fc04855bd058c926ec0
3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e"""
sh % "hg log '-T{rev}:{node}\\n' '-r:0'" == r"""
abort: hidden revision '0'!
(use --hidden to access hidden revisions)
[255]"""
sh % "hg log '-T{rev}:{node}\\n' '-r:0'" == "0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05"
sh % "hg log '-T{rev}:{node}\\n' -f" == r"""
3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
2:94375ec45bddd2a824535fc04855bd058c926ec0"""
@ -1984,14 +1986,9 @@ sh % "hg log -G" == r"""
sh % "hg log -G a" == r"""
o changeset: 4:50b9b36e9c5d
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: content3
|
@ changeset: 3:15b2327059e5
: user: test
: date: Thu Jan 01 00:00:00 1970 +0000
: summary: content2
: summary: content3
:
o changeset: 0:ae0a3c9f9e95
user: test
@ -2003,11 +2000,6 @@ sh % "hg log -G a" == r"""
sh % "hg log -T '{node}\\n' -r 4" == "50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2"
sh % "hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2" == ""
sh % "hg log -G a" == r"""
@ changeset: 3:15b2327059e5
: user: test
: date: Thu Jan 01 00:00:00 1970 +0000
: summary: content2
:
o changeset: 0:ae0a3c9f9e95
user: test
date: Thu Jan 01 00:00:00 1970 +0000

4
eden/scm/tests/test-pull-update-t.py
View File

@ -124,7 +124,7 @@ sh % "hg bookmarks" == r"""
# (discard pulled changes)
sh % "hg update -q 483b76ad4309"
sh % "hg rollback -q"
sh % "hg rollback -q" == "unknown reference in .hg/bookmarks: active-after-pull f815b3da61635081d9570544593e2ad30a0d9655"
# (2) activating by URL#BOOKMARK
@ -150,7 +150,7 @@ sh % "hg bookmarks" == r"""
# (discard pulled changes)
sh % "hg update -q 483b76ad4309"
sh % "hg rollback -q"
sh % "hg rollback -q" == "unknown reference in .hg/bookmarks: active-after-pull f815b3da61635081d9570544593e2ad30a0d9655"
# Test that updating deactivates current active bookmark, if the
# destination of the update is explicitly specified, and it doesn't

12
eden/scm/tests/test-rebase-check-restore-t.py
View File

@ -56,7 +56,6 @@ sh % "cd .."
sh % "hg clone -q -u . a a1"
sh % "cd a1"
sh % "hg phase --force --secret 2"
sh % "tglogp" == r"""
@ 5: 3225f3ea730a draft 'F'
@ -65,7 +64,7 @@ sh % "tglogp" == r"""
| |
| o 3: 46b37eabc604 draft 'D'
|/
| o 2: 965c486023db secret 'C'
| o 2: 965c486023db draft 'C'
| |
| o 1: 27547f69f254 draft 'B'
|/
@ -90,7 +89,7 @@ sh % "hg rebase --continue" == r'''
rebasing 965c486023db "C"'''
sh % "tglogp" == r"""
o 7: d2d25e26288e secret 'C'
o 7: d2d25e26288e draft 'C'
|
o 6: 45396c49d53b draft 'B'
|
@ -100,7 +99,7 @@ sh % "tglogp" == r"""
| |
o | 3: 46b37eabc604 draft 'D'
|/
| o 2: 965c486023db secret 'C'
| o 2: 965c486023db draft 'C'
| |
| o 1: 27547f69f254 draft 'B'
|/
@ -112,7 +111,6 @@ sh % "cd .."
sh % "hg clone -q -u . a a2"
sh % "cd a2"
sh % "hg phase --force --secret 2"
sh % "tglogp" == r"""
@ 5: 3225f3ea730a draft 'F'
@ -121,7 +119,7 @@ sh % "tglogp" == r"""
| |
| o 3: 46b37eabc604 draft 'D'
|/
| o 2: 965c486023db secret 'C'
| o 2: 965c486023db draft 'C'
| |
| o 1: 27547f69f254 draft 'B'
|/
@ -149,7 +147,7 @@ sh % "tglogp" == r"""
|
o 3: 46b37eabc604 draft 'D'
|
| o 2: 965c486023db secret 'C'
| o 2: 965c486023db draft 'C'
| |
| o 1: 27547f69f254 draft 'B'
|/

8
eden/scm/tests/test-remotenames-strip-t.py
View File

@ -25,11 +25,11 @@ sh % "hg commit -Aqm bb"
sh % "hg book foo"
sh % "hg log -T '{desc} ({bookmarks}) ({remotebookmarks})\\n'" == r"""
bb (foo) ()
aa () (default/master)
aa () (default/master public/a6e72781733c178cd290a07022bb6c8460749e7b)
a () ()"""
sh % "hg debugstrip -qB foo" == "bookmark 'foo' deleted"
sh % "hg log -T '{desc} ({bookmarks}) ({remotebookmarks})\\n'" == r"""
aa () (default/master)
aa () (default/master public/a6e72781733c178cd290a07022bb6c8460749e7b)
a () ()"""
# Test that hg debugstrip -B deletes bookmark even if there is a remote bookmark,
@ -42,9 +42,9 @@ sh % "hg commit -Aqm a"
sh % "hg debugmakepublic"
sh % "hg push -q --to master --create"
sh % "hg book foo"
sh % "hg log -T '{desc} ({bookmarks}) ({remotebookmarks})\\n'" == "a (foo) (default/master)"
sh % "hg log -T '{desc} ({bookmarks}) ({remotebookmarks})\\n'" == "a (foo) (default/master public/770eb8fce608e2c55f853a8a5ea328b659d70616)"
sh % "hg debugstrip -qB foo" == r"""
bookmark 'foo' deleted
abort: empty revision set
[255]"""
sh % "hg log -T '{desc} ({bookmarks}) ({remotebookmarks})\\n'" == "a () (default/master)"
sh % "hg log -T '{desc} ({bookmarks}) ({remotebookmarks})\\n'" == "a () (default/master public/770eb8fce608e2c55f853a8a5ea328b659d70616)"

44
eden/scm/tests/test-shelve-t.py
View File

@ -12,10 +12,6 @@ from edenscm.mercurial import extensions, hg, obsolete
from testutil.dott import feature, sh, shlib, testtmp # noqa: F401
# TODO: Make this test compatibile with obsstore enabled.
sh % "setconfig 'experimental.evolution='"
sh % "cat" << r"""
[extensions]
strip =
@ -426,16 +422,18 @@ sh % "'HGMERGE=true' hg unshelve" == r"""
merging a/a
note: rebase of 18:056f8c92b111 created no changes to commit"""
sh % "hg shelve -l"
sh % "hg status" == "A foo/foo"
sh % "hg status" == r"""
M a/a
A foo/foo"""
sh % "cat a/a" == r"""
a
c
x"""
a"""
# Test keep and cleanup
sh % "hg shelve" == r"""
shelved as default
0 files updated, 0 files merged, 1 files removed, 0 files unresolved"""
1 files updated, 0 files merged, 1 files removed, 0 files unresolved"""
sh % "hg shelve --list" == "default * shelve changes to: create conflict (glob)"
sh % "hg unshelve -k" == "unshelving change 'default'"
sh % "hg shelve --list" == "default * shelve changes to: create conflict (glob)"
@ -447,7 +445,7 @@ sh % "hg bookmark test"
sh % "hg bookmark" == " * test * (glob)"
sh % "hg shelve" == r"""
shelved as test
0 files updated, 0 files merged, 1 files removed, 0 files unresolved"""
1 files updated, 0 files merged, 1 files removed, 0 files unresolved"""
sh % "hg bookmark" == " * test * (glob)"
sh % "hg unshelve" == "unshelving change 'test'"
sh % "hg bookmark" == " * test * (glob)"
@ -455,7 +453,7 @@ sh % "hg bookmark" == " * test * (glob)"
# Shelve should still work even if mq is disabled
sh % "hg --config 'extensions.mq=!' shelve" == r"""
shelved as test
0 files updated, 0 files merged, 1 files removed, 0 files unresolved"""
1 files updated, 0 files merged, 1 files removed, 0 files unresolved"""
sh % "hg --config 'extensions.mq=!' shelve --list" == "test * shelve changes to: create conflict (glob)"
sh % "hg bookmark" == " * test * (glob)"
sh % "hg --config 'extensions.mq=!' unshelve" == "unshelving change 'test'"
@ -585,7 +583,21 @@ sh % "hg shelve" == r"""
sh % "hg log -G --template '{rev} {desc|firstline} {author}'" == r"""
@ 9 commit stuff test
|
| o 2 c test
| o 8 shelve changes to: a test
|/
| o 7 shelve changes to: a test
|/
| o 6 shelve changes to: b test
|/
| o 5 shelve changes to: b test
| |
| | o 4 shelve changes to: c test
| |/
| | o 3 shelve changes to: c test
| | |
+---o 2 c test
| |
| o 1 b test
|/
o 0 a test"""
sh % "mv f.orig f"
@ -1048,20 +1060,20 @@ sh % "cd obsshare"
sh % "hg bookmarks" == " test 19:a72d63c69876"
sh % "hg bookmarks foo"
sh % "hg bookmarks" == r"""
* foo 29:47f190a8b2e0
test 19:a72d63c69876"""
* foo 29:47f190a8b2e0
test 19:a72d63c69876"""
sh % "echo x" >> "x"
sh % "hg shelve" == r"""
shelved as foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved"""
sh % "hg bookmarks" == r"""
* foo 29:47f190a8b2e0
test 19:a72d63c69876"""
* foo 29:47f190a8b2e0
test 19:a72d63c69876"""
sh % "hg unshelve" == "unshelving change 'foo'"
sh % "hg bookmarks" == r"""
* foo 29:47f190a8b2e0
test 19:a72d63c69876"""
* foo 29:47f190a8b2e0
test 19:a72d63c69876"""
sh % "cd .."