##// END OF EJS Templates
run-tests: stop automatically adding a (glob) for bundle backup lines...
Matt Harbison -
r35392:0432e54f default
parent child Browse files
Show More
@@ -973,7 +973,7 b' class Test(unittest.TestCase):'
973 self._portmap(1),
973 self._portmap(1),
974 self._portmap(2),
974 self._portmap(2),
975 (br'(?m)^(saved backup bundle to .*\.hg)( \(glob\))?$',
975 (br'(?m)^(saved backup bundle to .*\.hg)( \(glob\))?$',
976 br'\1 (glob)'),
976 br'\1'.replace(br'\\', br'/')),
977 (br'([^0-9])%s' % re.escape(self._localip()), br'\1$LOCALIP'),
977 (br'([^0-9])%s' % re.escape(self._localip()), br'\1$LOCALIP'),
978 (br'\bHG_TXNID=TXN:[a-f0-9]{40}\b', br'HG_TXNID=TXN:$ID$'),
978 (br'\bHG_TXNID=TXN:[a-f0-9]{40}\b', br'HG_TXNID=TXN:$ID$'),
979 ]
979 ]
@@ -706,7 +706,7 b' Accept the fix'
706 $ echo " $ echo 'saved backup bundle to \$TESTTMP/foo.hg'" >> test-failure.t
706 $ echo " $ echo 'saved backup bundle to \$TESTTMP/foo.hg'" >> test-failure.t
707 $ echo " saved backup bundle to \$TESTTMP/foo.hg" >> test-failure.t
707 $ echo " saved backup bundle to \$TESTTMP/foo.hg" >> test-failure.t
708 $ echo " $ echo 'saved backup bundle to \$TESTTMP/foo.hg'" >> test-failure.t
708 $ echo " $ echo 'saved backup bundle to \$TESTTMP/foo.hg'" >> test-failure.t
709 $ echo " saved backup bundle to \$TESTTMP/foo.hg (glob)" >> test-failure.t
709 $ echo " saved backup bundle to \$TESTTMP\\foo.hg" >> test-failure.t
710 $ echo " $ echo 'saved backup bundle to \$TESTTMP/foo.hg'" >> test-failure.t
710 $ echo " $ echo 'saved backup bundle to \$TESTTMP/foo.hg'" >> test-failure.t
711 $ echo " saved backup bundle to \$TESTTMP/*.hg (glob)" >> test-failure.t
711 $ echo " saved backup bundle to \$TESTTMP/*.hg (glob)" >> test-failure.t
712 $ echo 'y' | rt -i 2>&1
712 $ echo 'y' | rt -i 2>&1
@@ -720,15 +720,14 b' Accept the fix'
720 This is a noop statement so that
720 This is a noop statement so that
721 this test is still more bytes than success.
721 this test is still more bytes than success.
722 pad pad pad pad............................................................
722 pad pad pad pad............................................................
723 @@ -9,7 +9,7 @@
723 @@ -11,6 +11,6 @@
724 pad pad pad pad............................................................
724 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
725 pad pad pad pad............................................................
725 saved backup bundle to $TESTTMP/foo.hg
726 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
726 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
727 - saved backup bundle to $TESTTMP/foo.hg
727 - saved backup bundle to $TESTTMP\foo.hg
728 + saved backup bundle to $TESTTMP/foo.hg* (glob)
728 + saved backup bundle to $TESTTMP/foo.hg
729 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
729 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
730 saved backup bundle to $TESTTMP/foo.hg* (glob)
730 saved backup bundle to $TESTTMP/*.hg (glob)
731 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
732 Accept this change? [n] ..
731 Accept this change? [n] ..
733 # Ran 2 tests, 0 skipped, 0 failed.
732 # Ran 2 tests, 0 skipped, 0 failed.
734
733
@@ -744,9 +743,9 b' Accept the fix'
744 pad pad pad pad............................................................
743 pad pad pad pad............................................................
745 pad pad pad pad............................................................
744 pad pad pad pad............................................................
746 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
745 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
747 saved backup bundle to $TESTTMP/foo.hg (glob)<
746 saved backup bundle to $TESTTMP/foo.hg
748 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
747 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
749 saved backup bundle to $TESTTMP/foo.hg (glob)<
748 saved backup bundle to $TESTTMP/foo.hg
750 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
749 $ echo 'saved backup bundle to $TESTTMP/foo.hg'
751 saved backup bundle to $TESTTMP/*.hg (glob)<
750 saved backup bundle to $TESTTMP/*.hg (glob)<
752
751
General Comments 0
You need to be logged in to leave comments. Login now