Patchwork [2,of,2,evolve-ext] test: add glob annotations where Mercurial's run-tests.py suggests

login
register
mail settings
Submitter Matt Harbison
Date Sept. 4, 2014, 2:18 a.m.
Message ID <a41203e600e2446fb2b6.1409797139@Envy>
Download mbox | patch
Permalink /patch/5693/
State Accepted
Headers show

Comments

Matt Harbison - Sept. 4, 2014, 2:18 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1407891754 14400
#      Tue Aug 12 21:02:34 2014 -0400
# Node ID a41203e600e2446fb2b66d5f54e1d4f6110d7a0e
# Parent  85f4f4f6c403f61c9add2bb54ffff1988efaaa4e
test: add glob annotations where Mercurial's run-tests.py suggests

These happen to also be 5 of the 6 tests that warn about no result code when run
on Windows.  Probably not a coincidence.

The tests previously warned about no result code whether or not it was run
interactively.  They only started working when test output changes were accepted
in interactive mode, and these globs were added automatically.
Pierre-Yves David - Sept. 4, 2014, 7:18 a.m.
On 09/04/2014 04:18 AM, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1407891754 14400
> #      Tue Aug 12 21:02:34 2014 -0400
> # Node ID a41203e600e2446fb2b66d5f54e1d4f6110d7a0e
> # Parent  85f4f4f6c403f61c9add2bb54ffff1988efaaa4e
> test: add glob annotations where Mercurial's run-tests.py suggests

woops, both patches pushed.

>
> These happen to also be 5 of the 6 tests that warn about no result code when run
> on Windows.  Probably not a coincidence.
>
> The tests previously warned about no result code whether or not it was run
> interactively.  They only started working when test output changes were accepted
> in interactive mode, and these globs were added automatically.
>
> diff --git a/tests/test-drop.t b/tests/test-drop.t
> --- a/tests/test-drop.t
> +++ b/tests/test-drop.t
> @@ -63,7 +63,7 @@
>     0 obsmarkers found
>     search nodes: wall * comb * user * sys * (glob)
>     1 nodes found
> -  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d4e7845543ff-drophack.hg
> +  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d4e7845543ff-drophack.hg (glob)
>     strip nodes: wall * comb * user * sys * (glob)
>     $ summary
>     ============ graph ==============
> diff --git a/tests/test-evolve.t b/tests/test-evolve.t
> --- a/tests/test-evolve.t
> +++ b/tests/test-evolve.t
> @@ -447,7 +447,7 @@
>     abort: empty revision set
>     [255]
>     $ hg --config extensions.hgext.mq= strip --hidden 'extinct()'
> -  saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-backup.hg
> +  saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-backup.hg (glob)
>     $ hg verify
>     checking changesets
>     checking manifests
> diff --git a/tests/test-sharing.t b/tests/test-sharing.t
> --- a/tests/test-sharing.t
> +++ b/tests/test-sharing.t
> @@ -106,7 +106,7 @@
>
>   This bug fix is finished. We can push it to the public repository.
>     $ hg push
> -  pushing to $TESTTMP/public
> +  pushing to $TESTTMP/public (glob)
>     searching for changes
>     adding changesets
>     adding manifests
> diff --git a/tests/test-tutorial.t b/tests/test-tutorial.t
> --- a/tests/test-tutorial.t
> +++ b/tests/test-tutorial.t
> @@ -92,7 +92,7 @@
>   Its first version is shared with the outside.
>
>     $ hg push remote
> -  pushing to $TESTTMP/remote
> +  pushing to $TESTTMP/remote (glob)
>     searching for changes
>     adding changesets
>     adding manifests
> @@ -218,7 +218,7 @@
>   I'll get this remote changeset when pulling
>
>     $ hg pull remote
> -  pulling from $TESTTMP/remote
> +  pulling from $TESTTMP/remote (glob)
>     searching for changes
>     adding changesets
>     adding manifests
> @@ -397,7 +397,7 @@
>   we can now push our change:
>
>     $ hg push remote
> -  pushing to $TESTTMP/remote
> +  pushing to $TESTTMP/remote (glob)
>     searching for changes
>     adding changesets
>     adding manifests
> @@ -517,7 +517,7 @@
>   is ``true`` by default.
>
>     $ hg pull local
> -  pulling from $TESTTMP/local
> +  pulling from $TESTTMP/local (glob)
>     searching for changes
>     adding changesets
>     adding manifests
> @@ -575,7 +575,7 @@
>   I can now exchange mutable changeset between "remote" and "local" repository.
>
>     $ hg pull local
> -  pulling from $TESTTMP/local
> +  pulling from $TESTTMP/local (glob)
>     searching for changes
>     adding changesets
>     adding manifests
> @@ -636,7 +636,7 @@
>   When we pull from remote again we get an unstable state!
>
>     $ hg pull remote
> -  pulling from $TESTTMP/remote
> +  pulling from $TESTTMP/remote (glob)
>     searching for changes
>     adding changesets
>     adding manifests
> @@ -678,7 +678,7 @@
>   share it with the outside:
>
>     $ hg push other
> -  pushing to $TESTTMP/other
> +  pushing to $TESTTMP/other (glob)
>     searching for changes
>     abort: push includes unstable changeset: bf1b0d202029!
>     (use 'hg evolve' to get a stable history or --force to ignore warnings)
> @@ -727,7 +727,7 @@
>   We can push this evolution to remote
>
>     $ hg push remote
> -  pushing to $TESTTMP/remote
> +  pushing to $TESTTMP/remote (glob)
>     searching for changes
>     adding changesets
>     adding manifests
> @@ -740,7 +740,7 @@
>
>     $ cd ../remote
>     $ hg pull local # we up again to trigger the warning. it was displayed during the push
> -  pulling from $TESTTMP/local
> +  pulling from $TESTTMP/local (glob)
>     searching for changes
>     no changes found
>     pull obsolescence markers
> @@ -769,7 +769,7 @@
>
>     $ cd ../local
>     $ hg pull remote
> -  pulling from $TESTTMP/remote
> +  pulling from $TESTTMP/remote (glob)
>     searching for changes
>     adding changesets
>     adding manifests
> diff --git a/tests/test-userguide.t b/tests/test-userguide.t
> --- a/tests/test-userguide.t
> +++ b/tests/test-userguide.t
> @@ -18,7 +18,7 @@
>   example 2: unsafe amend with plain vanilla Mercurial: the original
>   commit is stripped
>     $ hg commit --amend -u alice -d '1 0' -m 'implement feature Y'
> -  saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-amend-backup.hg
> +  saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-amend-backup.hg (glob)
>     $ hg log -r 23fe4ac6d3f1
>     abort: unknown revision '23fe4ac6d3f1'!
>     [255]
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>

Patch

diff --git a/tests/test-drop.t b/tests/test-drop.t
--- a/tests/test-drop.t
+++ b/tests/test-drop.t
@@ -63,7 +63,7 @@ 
   0 obsmarkers found
   search nodes: wall * comb * user * sys * (glob)
   1 nodes found
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d4e7845543ff-drophack.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d4e7845543ff-drophack.hg (glob)
   strip nodes: wall * comb * user * sys * (glob)
   $ summary
   ============ graph ==============
diff --git a/tests/test-evolve.t b/tests/test-evolve.t
--- a/tests/test-evolve.t
+++ b/tests/test-evolve.t
@@ -447,7 +447,7 @@ 
   abort: empty revision set
   [255]
   $ hg --config extensions.hgext.mq= strip --hidden 'extinct()'
-  saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-backup.hg
+  saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-backup.hg (glob)
   $ hg verify
   checking changesets
   checking manifests
diff --git a/tests/test-sharing.t b/tests/test-sharing.t
--- a/tests/test-sharing.t
+++ b/tests/test-sharing.t
@@ -106,7 +106,7 @@ 
   
 This bug fix is finished. We can push it to the public repository.
   $ hg push
-  pushing to $TESTTMP/public
+  pushing to $TESTTMP/public (glob)
   searching for changes
   adding changesets
   adding manifests
diff --git a/tests/test-tutorial.t b/tests/test-tutorial.t
--- a/tests/test-tutorial.t
+++ b/tests/test-tutorial.t
@@ -92,7 +92,7 @@ 
 Its first version is shared with the outside.
 
   $ hg push remote
-  pushing to $TESTTMP/remote
+  pushing to $TESTTMP/remote (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -218,7 +218,7 @@ 
 I'll get this remote changeset when pulling
 
   $ hg pull remote
-  pulling from $TESTTMP/remote
+  pulling from $TESTTMP/remote (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -397,7 +397,7 @@ 
 we can now push our change:
 
   $ hg push remote
-  pushing to $TESTTMP/remote
+  pushing to $TESTTMP/remote (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -517,7 +517,7 @@ 
 is ``true`` by default.
 
   $ hg pull local
-  pulling from $TESTTMP/local
+  pulling from $TESTTMP/local (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -575,7 +575,7 @@ 
 I can now exchange mutable changeset between "remote" and "local" repository.
 
   $ hg pull local
-  pulling from $TESTTMP/local
+  pulling from $TESTTMP/local (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -636,7 +636,7 @@ 
 When we pull from remote again we get an unstable state!
 
   $ hg pull remote
-  pulling from $TESTTMP/remote
+  pulling from $TESTTMP/remote (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -678,7 +678,7 @@ 
 share it with the outside:
 
   $ hg push other
-  pushing to $TESTTMP/other
+  pushing to $TESTTMP/other (glob)
   searching for changes
   abort: push includes unstable changeset: bf1b0d202029!
   (use 'hg evolve' to get a stable history or --force to ignore warnings)
@@ -727,7 +727,7 @@ 
 We can push this evolution to remote
 
   $ hg push remote
-  pushing to $TESTTMP/remote
+  pushing to $TESTTMP/remote (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -740,7 +740,7 @@ 
 
   $ cd ../remote
   $ hg pull local # we up again to trigger the warning. it was displayed during the push
-  pulling from $TESTTMP/local
+  pulling from $TESTTMP/local (glob)
   searching for changes
   no changes found
   pull obsolescence markers
@@ -769,7 +769,7 @@ 
 
   $ cd ../local
   $ hg pull remote
-  pulling from $TESTTMP/remote
+  pulling from $TESTTMP/remote (glob)
   searching for changes
   adding changesets
   adding manifests
diff --git a/tests/test-userguide.t b/tests/test-userguide.t
--- a/tests/test-userguide.t
+++ b/tests/test-userguide.t
@@ -18,7 +18,7 @@ 
 example 2: unsafe amend with plain vanilla Mercurial: the original
 commit is stripped
   $ hg commit --amend -u alice -d '1 0' -m 'implement feature Y'
-  saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-amend-backup.hg
+  saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-amend-backup.hg (glob)
   $ hg log -r 23fe4ac6d3f1
   abort: unknown revision '23fe4ac6d3f1'!
   [255]