[svk-commit] r2244 - in trunk: t t/mirror

[nobody at bestpractical.com]

Author: clkao
Date: Wed Dec 20 08:03:16 2006
New Revision: 2244

Modified:
   trunk/   (props changed)
   trunk/t/75hook.t
   trunk/t/mirror/sync-failed-hook.t

Log:
 r7402 at ubuntu (orig r2238):  clkao | 2006-12-13 16:47:51 +0800
 Tweak the expected output for hook failure on commit to pass
 tests for svn trunk as well.
 


Modified: trunk/t/75hook.t
==============================================================================
--- trunk/t/75hook.t	(original)
+++ trunk/t/75hook.t	Wed Dec 20 08:03:16 2006
@@ -19,7 +19,7 @@
 
 my $hook = "$srepospath/hooks/pre-commit".($^O eq 'MSWin32' ? '.bat' : '');
 open FH, '>', $hook or die "$hook: $!";
-print FH ($^O eq 'MSWin32' ? '@echo off' : "#!$^X") . "\nexit 1\n";
+print FH ($^O eq 'MSWin32' ? '@echo off' : "#!$^X") . "\nwarn \"foo\\n\";\nexit 1\n";
 close FH;
 chmod (0755, $hook);
 
@@ -38,8 +38,8 @@
 is_output ($svk, 'ci', ['-m', 'test commit', $copath],
 	   ['Commit into mirrored path: merging back directly.',
 	    "Merging back to mirror source $uri/A.",
-	    "A repository hook failed: 'pre-commit' hook failed with error output:",
-	    '',
+	    qr"A repository hook failed: 'pre-commit' hook failed .* error output.*:",
+	    'foo', ''
 	   ]);
 
 1;

Modified: trunk/t/mirror/sync-failed-hook.t
==============================================================================
--- trunk/t/mirror/sync-failed-hook.t	(original)
+++ trunk/t/mirror/sync-failed-hook.t	Wed Dec 20 08:03:16 2006
@@ -44,7 +44,7 @@
 is_output($svk, 'sync', ['//m'],
 	  ["Syncing $uri",
 	   'Retrieving log information from 2 to 2',
-	   "A repository hook failed: 'pre-commit' hook failed with error output:",
+	   qr"A repository hook failed: 'pre-commit' hook failed .* error output.*:",
 	   'hate']);
 
 __DATA__