changeset 16540:4fe8eb4a6e2c stable

tests: add missing accept of native pathname separator
author Mads Kiilerich <mads@kiilerich.com>
date Sat, 28 Apr 2012 01:55:39 +0200
parents 249542ded278
children bb3334806ace
files tests/test-mq-qnew.t tests/test-rebase-scenario-global.t tests/test-ssh.t tests/test-subrepo-recursion.t tests/test-subrepo.t
diffstat 5 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-mq-qnew.t	Sat Apr 28 01:22:56 2012 +0200
+++ b/tests/test-mq-qnew.t	Sat Apr 28 01:55:39 2012 +0200
@@ -111,7 +111,7 @@
   abort: "#" cannot be used in the name of a patch
   abort: ":" cannot be used in the name of a patch
   % qnew with name containing slash
-  abort: path ends in directory separator: foo/
+  abort: path ends in directory separator: foo/ (glob)
   abort: "foo" already exists as a directory
   foo/bar.patch
   popping foo/bar.patch
@@ -178,7 +178,7 @@
   abort: "#" cannot be used in the name of a patch
   abort: ":" cannot be used in the name of a patch
   % qnew with name containing slash
-  abort: path ends in directory separator: foo/
+  abort: path ends in directory separator: foo/ (glob)
   abort: "foo" already exists as a directory
   foo/bar.patch
   popping foo/bar.patch
--- a/tests/test-rebase-scenario-global.t	Sat Apr 28 01:22:56 2012 +0200
+++ b/tests/test-rebase-scenario-global.t	Sat Apr 28 01:55:39 2012 +0200
@@ -286,25 +286,25 @@
 Check rebasing mutable changeset
 Source phase greater or equal to destination phase: new changeset get the phase of source:
   $ hg rebase -s9 -d0
-  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg
+  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg (glob)
   $ hg log --template "{phase}\n" -r 9
   draft
   $ hg rebase -s9 -d1
-  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg
+  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg (glob)
   $ hg log --template "{phase}\n" -r 9
   draft
   $ hg phase --force --secret 9
   $ hg rebase -s9 -d0
-  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg
+  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg (glob)
   $ hg log --template "{phase}\n" -r 9
   secret
   $ hg rebase -s9 -d1
-  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg
+  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg (glob)
   $ hg log --template "{phase}\n" -r 9
   secret
 Source phase lower than destination phase: new changeset get the phase of destination:
   $ hg rebase -s7 -d9
-  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c9659aac0000-backup.hg
+  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c9659aac0000-backup.hg (glob)
   $ hg log --template "{phase}\n" -r 9
   secret
 
--- a/tests/test-ssh.t	Sat Apr 28 01:22:56 2012 +0200
+++ b/tests/test-ssh.t	Sat Apr 28 01:55:39 2012 +0200
@@ -283,7 +283,7 @@
   $ SSH_ORIGINAL_COMMAND="'hg' -R 'a repo' serve --stdio" hg id --ssh "python \"$TESTDIR\"/../contrib/hg-ssh \"$TESTTMP/a repo\"" "ssh://user@dummy/a repo"
   3fb238f49e8c
   $ SSH_ORIGINAL_COMMAND="'hg' -R 'a repo' serve --stdio" hg id --ssh "python \"$TESTDIR\"/../contrib/hg-ssh \"$TESTTMP\"" "ssh://user@dummy/a repo"
-  remote: Illegal repository '$TESTTMP/a repo'
+  remote: Illegal repository '$TESTTMP/a repo' (glob)
   abort: no suitable response from remote hg!
   [255]
   $ SSH_ORIGINAL_COMMAND="'hg' -R 'a'repo' serve --stdio" hg id --ssh "python \"$TESTDIR\"/../contrib/hg-ssh \"$TESTTMP\"" "ssh://user@dummy/a repo"
--- a/tests/test-subrepo-recursion.t	Sat Apr 28 01:22:56 2012 +0200
+++ b/tests/test-subrepo-recursion.t	Sat Apr 28 01:55:39 2012 +0200
@@ -197,7 +197,7 @@
   $ hg status -S
   ? foo/bar/z2.txt
   $ hg forget foo/bar/z2.txt
-  not removing foo/bar/z2.txt: file is already untracked
+  not removing foo/bar/z2.txt: file is already untracked (glob)
   [1]
   $ hg status -S
   ? foo/bar/z2.txt
--- a/tests/test-subrepo.t	Sat Apr 28 01:22:56 2012 +0200
+++ b/tests/test-subrepo.t	Sat Apr 28 01:55:39 2012 +0200
@@ -43,7 +43,7 @@
   $ echo b > s/a
   $ hg revert "set:subrepo('glob:s*')"
   reverting subrepo s
-  reverting s/a
+  reverting s/a (glob)
   $ rm s/a.orig
 
 Revert subrepo with no backup. The "reverting s/a" line is gone since