[PATCH 3 of 4] tests: remove glob from output lines containing no glob character

Simon Heimberg simohe at besonet.ch
Tue Feb 12 17:05:32 CST 2013


# HG changeset patch
# User Simon Heimberg <simohe at besonet.ch>
# Date 1350336748 -7200
# Node ID a36b0c19bec9b4d43ab250b091fbddb614d75374
# Parent  282ccb8b49295d2fafb987ca1d7a1e609c18f3fa
tests: remove glob from output lines containing no glob character

diff -r 282ccb8b4929 -r a36b0c19bec9 tests/test-https.t
--- a/tests/test-https.t	Mon Okt 15 23:28:45 2012 +0200
+++ b/tests/test-https.t	Mon Okt 15 23:32:28 2012 +0200
@@ -106,7 +106,7 @@
 
 #if windows
   $ hg serve -p $HGPORT --certificate=$PRIV 2>&1
-  abort: cannot start server at ':$HGPORT': (glob)
+  abort: cannot start server at ':$HGPORT':* (glob)
   [255]
 #else
   $ hg serve -p $HGPORT --certificate=$PRIV 2>&1
diff -r 282ccb8b4929 -r a36b0c19bec9 tests/test-walk.t
--- a/tests/test-walk.t	Mon Okt 15 23:28:45 2012 +0200
+++ b/tests/test-walk.t	Mon Okt 15 23:32:28 2012 +0200
@@ -155,7 +155,7 @@
   abort: path 'mammals/.hg' is inside nested repo 'mammals' (glob)
   [255]
   $ hg debugwalk ../.hg
-  abort: path contains illegal component: .hg (glob)
+  abort: path contains illegal component: .hg
   [255]
   $ cd ..
 
@@ -187,10 +187,10 @@
   abort: beans/../.. not under root '$TESTTMP/t' (glob)
   [255]
   $ hg debugwalk .hg
-  abort: path contains illegal component: .hg (glob)
+  abort: path contains illegal component: .hg
   [255]
   $ hg debugwalk beans/../.hg
-  abort: path contains illegal component: .hg (glob)
+  abort: path contains illegal component: .hg
   [255]
   $ hg debugwalk beans/../.hg/data
   abort: path contains illegal component: .hg/data (glob)


More information about the Mercurial-devel mailing list