[PATCH] tests: removed test names in tests
Erik Zielke
ez at aragost.com
Thu Sep 30 02:50:30 CDT 2010
# HG changeset patch
# User Erik Zielke <ez at aragost.com>
# Date 1285832980 -7200
# Node ID 14ab6aa028fb0d32395a77dd741abf4571b13e24
# Parent e6f2adb91f349ab24866341a85d1b7188e35b4d2
tests: removed test names in tests
The name of the test files is replaced with a glob * expression,
thereby the tests does not depend on the filename of the file they are
in.
diff -r e6f2adb91f34 -r 14ab6aa028fb tests/test-audit-path.t
--- a/tests/test-audit-path.t Mon Sep 27 11:27:58 2010 +0200
+++ b/tests/test-audit-path.t Thu Sep 30 09:49:40 2010 +0200
@@ -78,5 +78,5 @@
$ hg manifest -r4
/tmp/test
$ hg update -Cr4
- abort: No such file or directory: */test-audit-path.t/target//tmp/test (glob)
+ abort: No such file or directory: */target//tmp/test (glob)
[255]
diff -r e6f2adb91f34 -r 14ab6aa028fb tests/test-convert-svn-encoding.t
--- a/tests/test-convert-svn-encoding.t Mon Sep 27 11:27:58 2010 +0200
+++ b/tests/test-convert-svn-encoding.t Thu Sep 30 09:49:40 2010 +0200
@@ -14,7 +14,7 @@
$ hg --debug convert svn-repo A-hg
initializing destination A-hg repository
- reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob)
+ reparent to file://*/svn-repo (glob)
run hg sink pre-conversion action
scanning source...
found trunk at 'trunk'
@@ -23,7 +23,7 @@
found branch branché at 5
found branch branchée at 6
scanning: 1 revisions
- reparent to file://*/test-convert-svn-encoding.t/svn-repo/trunk (glob)
+ reparent to file://*/svn-repo/trunk (glob)
fetching revision log for "/trunk" from 4 to 0
parsing revision 4 (2 changes)
parsing revision 3 (4 changes)
@@ -33,18 +33,18 @@
'/branches' is not under '/trunk', ignoring
'/tags' is not under '/trunk', ignoring
scanning: 2 revisions
- reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9 (glob)
+ reparent to file://*/svn-repo/branches/branch%C3%A9 (glob)
fetching revision log for "/branches/branché" from 5 to 0
parsing revision 5 (1 changes)
- reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob)
- reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9 (glob)
+ reparent to file://*/svn-repo (glob)
+ reparent to file://*/svn-repo/branches/branch%C3%A9 (glob)
found parent of branch /branches/branché at 4: /trunk
scanning: 3 revisions
- reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9e (glob)
+ reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
fetching revision log for "/branches/branchée" from 6 to 0
parsing revision 6 (1 changes)
- reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob)
- reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9e (glob)
+ reparent to file://*/svn-repo (glob)
+ reparent to file://*/svn-repo/branches/branch%C3%A9e (glob)
found parent of branch /branches/branchée at 5: /branches/branché
scanning: 4 revisions
scanning: 5 revisions
@@ -57,7 +57,7 @@
4 hello
source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk at 2
converting: 1/6 revisions (16.67%)
- reparent to file://*/test-convert-svn-encoding.t/svn-repo/trunk (glob)
+ reparent to file://*/svn-repo/trunk (glob)
scanning paths: /trunk/à 0/3 (0.00%)
scanning paths: /trunk/à/é 1/3 (33.33%)
scanning paths: /trunk/é 2/3 (66.67%)
@@ -70,14 +70,14 @@
converting: 2/6 revisions (33.33%)
scanning paths: /trunk/à 0/4 (0.00%)
gone from -1
- reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob)
- reparent to file://*/test-convert-svn-encoding.t/svn-repo/trunk (glob)
+ reparent to file://*/svn-repo (glob)
+ reparent to file://*/svn-repo/trunk (glob)
scanning paths: /trunk/è 1/4 (25.00%)
copied to è from é@2
scanning paths: /trunk/é 2/4 (50.00%)
gone from -1
- reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob)
- reparent to file://*/test-convert-svn-encoding.t/svn-repo/trunk (glob)
+ reparent to file://*/svn-repo (glob)
+ reparent to file://*/svn-repo/trunk (glob)
scanning paths: /trunk/ù 3/4 (75.00%)
mark /trunk/ù came from à:2
à/é
@@ -95,12 +95,12 @@
converting: 3/6 revisions (50.00%)
scanning paths: /trunk/è 0/2 (0.00%)
gone from -1
- reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob)
- reparent to file://*/test-convert-svn-encoding.t/svn-repo/trunk (glob)
+ reparent to file://*/svn-repo (glob)
+ reparent to file://*/svn-repo/trunk (glob)
scanning paths: /trunk/ù 1/2 (50.00%)
gone from -1
- reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob)
- reparent to file://*/test-convert-svn-encoding.t/svn-repo/trunk (glob)
+ reparent to file://*/svn-repo (glob)
+ reparent to file://*/svn-repo/trunk (glob)
è
getting files: è 1/2 (50.00%)
ù/é
@@ -108,17 +108,17 @@
1 branch to branch?
source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5
converting: 4/6 revisions (66.67%)
- reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9 (glob)
+ reparent to file://*/svn-repo/branches/branch%C3%A9 (glob)
scanning paths: /branches/branché 0/1 (0.00%)
0 branch to branch?e
source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e at 6
converting: 5/6 revisions (83.33%)
- reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9e (glob)
+ reparent to file://*svn-repo/branches/branch%C3%A9e (glob)
scanning paths: /branches/branchée 0/1 (0.00%)
- reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob)
- reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9e (glob)
- reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob)
- reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9e (glob)
+ reparent to file://*svn-repo (glob)
+ reparent to file://*svn-repo/branches/branch%C3%A9e (glob)
+ reparent to file://*svn-repo (glob)
+ reparent to file://*svn-repo/branches/branch%C3%A9e (glob)
updating tags
.hgtags
run hg sink post-conversion action
diff -r e6f2adb91f34 -r 14ab6aa028fb tests/test-extdiff.t
--- a/tests/test-extdiff.t Mon Sep 27 11:27:58 2010 +0200
+++ b/tests/test-extdiff.t Thu Sep 30 09:49:40 2010 +0200
@@ -74,13 +74,10 @@
Should diff cloned file against wc file:
- $ hg falabala > out
+ $ hg falabala
+ diffing a.2a13a4d2da36/a */a/a (glob)
[1]
-Cleanup the output since the wc is a tmp directory:
-
- $ sed 's:\(diffing [^ ]* \).*\(\/test-extdiff\):\1[tmp]\2:' out
- diffing a.2a13a4d2da36/a [tmp]/test-extdiff.t/a/a
Test --change option:
diff -r e6f2adb91f34 -r 14ab6aa028fb tests/test-hook.t
--- a/tests/test-hook.t Mon Sep 27 11:27:58 2010 +0200
+++ b/tests/test-hook.t Thu Sep 30 09:49:40 2010 +0200
@@ -17,7 +17,7 @@
$ hg add a
$ hg commit -m a
precommit hook: HG_PARENT1=0000000000000000000000000000000000000000
- pretxncommit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 HG_PENDING=$HGTMP/test-hook.t/a
+ pretxncommit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 HG_PENDING=$HGTMP/*/a (glob)
0:cb9a9f314b8b
commit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000
commit.b hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000
@@ -40,7 +40,7 @@
$ echo b >> a
$ hg commit -m a1 -d "1 0"
precommit hook: HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
- pretxncommit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$HGTMP/test-hook.t/a
+ pretxncommit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$HGTMP/*/a (glob)
1:ab228980c14d
commit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
commit.b hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
@@ -50,7 +50,7 @@
$ hg add b
$ hg commit -m b -d '1 0'
precommit hook: HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
- pretxncommit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$HGTMP/test-hook.t/a
+ pretxncommit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$HGTMP/*/a (glob)
2:ee9deb46ab31
commit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
commit.b hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
@@ -60,7 +60,7 @@
(branch merge, don't forget to commit)
$ hg commit -m merge -d '2 0'
precommit hook: HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
- pretxncommit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd HG_PENDING=$HGTMP/test-hook.t/a
+ pretxncommit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd HG_PENDING=$HGTMP/*/a (glob)
3:07f3376c1e65
commit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
commit.b hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
@@ -99,7 +99,7 @@
$ hg tag -d '3 0' a
pretag hook: HG_LOCAL=0 HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_TAG=a
precommit hook: HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
- pretxncommit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PENDING=$HGTMP/test-hook.t/a
+ pretxncommit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PENDING=$HGTMP/*/a (glob)
4:539e4b31b6dc
commit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
commit.b hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
@@ -133,10 +133,10 @@
4:539e4b31b6dc
$ hg commit -m 'fail' -d '4 0'
precommit hook: HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
- pretxncommit hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/test-hook.t/a
+ pretxncommit hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/*/a (glob)
5:6f611f8018c1
5:6f611f8018c1
- pretxncommit.forbid hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/test-hook.t/a
+ pretxncommit.forbid hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/*/a (glob)
transaction abort!
rollback completed
abort: pretxncommit.forbid1 hook exited with status 1
@@ -192,7 +192,7 @@
$ echo 'pretxnchangegroup.forbid1 = python ../printenv.py pretxnchangegroup.forbid 1' >> .hg/hgrc
$ hg pull ../a
4:539e4b31b6dc
- pretxnchangegroup.forbid hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/test-hook.t/b HG_SOURCE=pull HG_URL=file:
+ pretxnchangegroup.forbid hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/*/b HG_SOURCE=pull HG_URL=file: (glob)
pulling from ../a
searching for changes
adding changesets
diff -r e6f2adb91f34 -r 14ab6aa028fb tests/test-keyword.t
--- a/tests/test-keyword.t Mon Sep 27 11:27:58 2010 +0200
+++ b/tests/test-keyword.t Thu Sep 30 09:49:40 2010 +0200
@@ -686,7 +686,7 @@
> default = ../Test
> EOF
$ hg incoming
- comparing with *test-keyword.t/Test (glob)
+ comparing with */Test (glob)
searching for changes
changeset: 2:bb948857c743
tag: tip
diff -r e6f2adb91f34 -r 14ab6aa028fb tests/test-paths.t
--- a/tests/test-paths.t Mon Sep 27 11:27:58 2010 +0200
+++ b/tests/test-paths.t Thu Sep 30 09:49:40 2010 +0200
@@ -6,11 +6,11 @@
$ echo '[paths]' >> .hg/hgrc
$ echo 'dupe = ../b' >> .hg/hgrc
$ hg in dupe
- comparing with */test-paths.t/b (glob)
+ comparing with */b (glob)
no changes found
[1]
$ cd ..
$ hg -R a in dupe
- comparing with */test-paths.t/b (glob)
+ comparing with */b (glob)
no changes found
[1]
diff -r e6f2adb91f34 -r 14ab6aa028fb tests/test-ssh.t
--- a/tests/test-ssh.t Mon Sep 27 11:27:58 2010 +0200
+++ b/tests/test-ssh.t Thu Sep 30 09:49:40 2010 +0200
@@ -144,7 +144,7 @@
find incoming on the remote side (using absolute path)
$ hg incoming -R ../remote -e "python ../dummyssh" "ssh://user@dummy/`pwd`"
- comparing with ssh://user@dummy/*/test-ssh.t/local (glob)
+ comparing with ssh://user@dummy/*/local (glob)
searching for changes
changeset: 1:a28a9d1a809c
tag: tip
@@ -226,7 +226,7 @@
Got arguments 1:user at dummy 2:hg -R remote serve --stdio
Got arguments 1:user at dummy 2:hg -R remote serve --stdio
Got arguments 1:user at dummy 2:hg -R local serve --stdio
- Got arguments 1:user at dummy 2:hg -R /*/test-ssh.t/local serve --stdio (glob)
+ Got arguments 1:user at dummy 2:hg -R /*/local serve --stdio (glob)
Got arguments 1:user at dummy 2:hg -R remote serve --stdio
changegroup-in-remote hook: HG_NODE=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1
Got arguments 1:user at dummy 2:hg -R remote serve --stdio
diff -r e6f2adb91f34 -r 14ab6aa028fb tests/test-subrepo-paths.t
--- a/tests/test-subrepo-paths.t Mon Sep 27 11:27:58 2010 +0200
+++ b/tests/test-subrepo-paths.t Thu Sep 30 09:49:40 2010 +0200
@@ -28,5 +28,5 @@
> .* = \1
> EOF
$ hg debugsub
- abort: bad subrepository pattern in */test-subrepo-paths.t/outer/.hg/hgrc:2: invalid group reference (glob)
+ abort: bad subrepository pattern in */outer/.hg/hgrc:2: invalid group reference (glob)
[255]
diff -r e6f2adb91f34 -r 14ab6aa028fb tests/test-subrepo-recursion.t
--- a/tests/test-subrepo-recursion.t Mon Sep 27 11:27:58 2010 +0200
+++ b/tests/test-subrepo-recursion.t Thu Sep 30 09:49:40 2010 +0200
@@ -250,13 +250,13 @@
$ cd ..
$ hg clone repo repo2
updating to branch default
- pulling subrepo foo from */test-subrepo-recursion.t/repo/foo (glob)
+ pulling subrepo foo from */repo/foo (glob)
requesting all changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 7 changes to 3 files
- pulling subrepo foo/bar from */test-subrepo-recursion.t/repo/foo/bar (glob)
+ pulling subrepo foo/bar from */repo/foo/bar (glob)
requesting all changes
adding changesets
adding manifests
@@ -265,13 +265,13 @@
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo2
$ hg outgoing -S
- comparing with */test-subrepo-recursion.t/repo (glob)
+ comparing with */repo (glob)
searching for changes
no changes found
- comparing with */test-subrepo-recursion.t/repo/foo (glob)
+ comparing with */repo/foo (glob)
searching for changes
no changes found
- comparing with */test-subrepo-recursion.t/repo/foo/bar (glob)
+ comparing with */repo/foo/bar (glob)
searching for changes
no changes found
[1]
@@ -291,7 +291,7 @@
$ hg commit -m 3-4-2
committing subrepository foo
$ hg outgoing -S
- comparing with */test-subrepo-recursion.t/repo (glob)
+ comparing with */repo (glob)
searching for changes
changeset: 3:2655b8ecc4ee
tag: tip
@@ -299,7 +299,7 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: 3-4-2
- comparing with */test-subrepo-recursion.t/repo/foo (glob)
+ comparing with */repo/foo (glob)
searching for changes
changeset: 4:e96193d6cb36
tag: tip
@@ -307,7 +307,7 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: 3-4-2
- comparing with */test-subrepo-recursion.t/repo/foo/bar (glob)
+ comparing with */repo/foo/bar (glob)
searching for changes
no changes found
@@ -321,7 +321,7 @@
Test incoming:
$ hg incoming -S
- comparing with */test-subrepo-recursion.t/repo2 (glob)
+ comparing with */repo2 (glob)
searching for changes
changeset: 3:2655b8ecc4ee
tag: tip
@@ -329,7 +329,7 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: 3-4-2
- comparing with */test-subrepo-recursion.t/repo2/foo (glob)
+ comparing with */repo2/foo (glob)
searching for changes
changeset: 4:e96193d6cb36
tag: tip
@@ -337,7 +337,7 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: 3-4-2
- comparing with */test-subrepo-recursion.t/repo2/foo/bar (glob)
+ comparing with */repo2/foo/bar (glob)
searching for changes
no changes found
diff -r e6f2adb91f34 -r 14ab6aa028fb tests/test-subrepo.t
--- a/tests/test-subrepo.t Mon Sep 27 11:27:58 2010 +0200
+++ b/tests/test-subrepo.t Thu Sep 30 09:49:40 2010 +0200
@@ -542,9 +542,9 @@
$ cat mercurial2/main/nested_absolute/.hg/hgrc \
> mercurial2/main/nested_relative/.hg/hgrc
[paths]
- default = */test-subrepo.t/sub/mercurial/nested_absolute (glob)
+ default = */sub/mercurial/nested_absolute (glob)
[paths]
- default = */test-subrepo.t/sub/mercurial/nested_relative (glob)
+ default = */sub/mercurial/nested_relative (glob)
$ rm -rf mercurial mercurial2
Issue1977: multirepo push should fail if subrepo push fails
More information about the Mercurial-devel
mailing list