[svk-commit] r2910 - in branches/2.0-releng/t: .

[nobody at bestpractical.com]

Author: clkao
Date: Sat Jun  7 00:20:35 2008
New Revision: 2910

Modified:
   branches/2.0-releng/t/05svm.t
   branches/2.0-releng/t/36push-pull.t
   branches/2.0-releng/t/75hook.t
   branches/2.0-releng/t/mirror/sync-failed-hook.t

Log:
Merge various 1.5 compatibility from trunk for expected test output:

 r2626:  clkao | 2007-12-13 08:12:41 +0800
 escape expected regex output.

 r2699:  clsung | 2008-02-17 22:10:23 +0800
 - to pass in both svn 1.4/1.5

 r2706:  clsung | 2008-03-21 11:05:46 +0800
 - for different error output from svn 1.5
   - note with svn 1.5 this test will produce msg:
     # uncleaned txns (1) on //

 r2707:  clsung | 2008-03-21 11:11:20 +0800
 - for different error output from svn 1.5
  - same format with previous commit, but
  - no 'uncleaned txns (1) on //' msg


Modified: branches/2.0-releng/t/05svm.t
==============================================================================
--- branches/2.0-releng/t/05svm.t	(original)
+++ branches/2.0-releng/t/05svm.t	Sat Jun  7 00:20:35 2008
@@ -147,7 +147,7 @@
 
 
 is_output_like ($svk, 'mirror', ['--list'],
-            qr"//m.*$uri/A\n//m-99.*$uri/A-99");
+            qr"//m.*\Q$uri\E/A\n//m-99.*\Q$uri\E/A-99");
 
 is_output_like ($svk, 'mirror', ['//m-99', "$uri/A-99"],
             qr"already", 'repeated mirror failed');

Modified: branches/2.0-releng/t/36push-pull.t
==============================================================================
--- branches/2.0-releng/t/36push-pull.t	(original)
+++ branches/2.0-releng/t/36push-pull.t	Sat Jun  7 00:20:35 2008
@@ -202,7 +202,7 @@
 	    'Empty merge.',
 	    '===> Auto-merging (18, 25) /l2 to /m (base /m:16).',
 	    "Merging back to mirror source $uri/A.",
-	    qr"Transaction is out of date: Out of date: '/A/Q/qz' in transaction '.*'",
+        qr"Transaction is out of date: .+ '/A/Q/qz' .+",
 	    'Please sync mirrored path /m first.']);
 
 overwrite_file ("$corpath_test/push-newfile", "sync and not merged immediately\n");

Modified: branches/2.0-releng/t/75hook.t
==============================================================================
--- branches/2.0-releng/t/75hook.t	(original)
+++ branches/2.0-releng/t/75hook.t	Sat Jun  7 00:20:35 2008
@@ -34,7 +34,7 @@
 is_output ($svk, 'ci', ['-m', 'test commit', $copath],
 	   ['Commit into mirrored path: merging back directly.',
 	    "Merging back to mirror source $uri/A.",
-	    qr"A repository hook failed: 'pre-commit' hook failed .* error output.*:",
+	    qr"A repository hook failed: .*'?pre-commit'? hook .* output.*:",
 	    'foo', ''
 	   ]);
 1;

Modified: branches/2.0-releng/t/mirror/sync-failed-hook.t
==============================================================================
--- branches/2.0-releng/t/mirror/sync-failed-hook.t	(original)
+++ branches/2.0-releng/t/mirror/sync-failed-hook.t	Sat Jun  7 00:20:35 2008
@@ -41,7 +41,7 @@
 is_output($svk, 'sync', ['//m'],
 	  ["Syncing $uri",
 	   'Retrieving log information from 2 to 2',
-	   qr"A repository hook failed: 'pre-commit' hook failed .* error output.*:",
+	   qr"A repository hook failed: .*'?pre-commit'? hook .* output.*:",
 	   'hate']);
 }
 __DATA__