[svk-commit] r3036 - trunk/t

nobody at bestpractical.com nobody at bestpractical.com
Thu Jul 31 18:40:22 EDT 2008


Author: clkao
Date: Thu Jul 31 18:40:22 2008
New Revision: 3036

Modified:
   trunk/t/07smerge-co-deleted.t
   trunk/t/07smerge-delete2.t
   trunk/t/10switch-merge-ticket.t
   trunk/t/23commit-local-file-to-add.t
   trunk/t/29update-merge-ticket.t
   trunk/t/29update-props.t

Log:
more win32 test tweaks.


Modified: trunk/t/07smerge-co-deleted.t
==============================================================================
--- trunk/t/07smerge-co-deleted.t	(original)
+++ trunk/t/07smerge-co-deleted.t	Thu Jul 31 18:40:22 2008
@@ -21,12 +21,12 @@
 
 is_output($svk, 'sm', ['-C', '//trunk', $copath],
     ['Auto-merging (3, 6) /trunk to /local (base /trunk:3).',
-     'U   t/checkout/smerge/me',
+     __('U   t/checkout/smerge/me'),
      qr'New merge ticket: .*:/trunk:6']
 );
 is_output($svk, 'sm', ['//trunk', $copath],
     ['Auto-merging (3, 6) /trunk to /local (base /trunk:3).',
-     'U   t/checkout/smerge/me',
+     __('U   t/checkout/smerge/me'),
      qr'New merge ticket: .*:/trunk:6']
 );
 

Modified: trunk/t/07smerge-delete2.t
==============================================================================
--- trunk/t/07smerge-delete2.t	(original)
+++ trunk/t/07smerge-delete2.t	Thu Jul 31 18:40:22 2008
@@ -32,9 +32,9 @@
 # XXX: skipped is wrong, but anyway it must report things at least
 is_output ($svk, 'smerge', ['-C', '//trunk', '//local'],
 	   ['Auto-merging (2, 6) /trunk to /local (base /trunk:2).',
-	    __"    A - skipped",
-	    __"    A/a_file - skipped",
-	    __"    A/a_dir - skipped",
+	    "    A - skipped",
+	    "    A/a_file - skipped",
+	    "    A/a_dir - skipped",
 	    "Empty merge.",
 	   ]);
 

Modified: trunk/t/10switch-merge-ticket.t
==============================================================================
--- trunk/t/10switch-merge-ticket.t	(original)
+++ trunk/t/10switch-merge-ticket.t	Thu Jul 31 18:40:22 2008
@@ -37,10 +37,10 @@
 $svk->switch ('//local-another', $copath);
 is_output($svk, 'diff', [$copath],
     [
-    '=== t/checkout/smerge/me',
+    __('=== t/checkout/smerge/me'),
     '==================================================================',
-    "--- t/checkout/smerge/me\t(revision 9)",
-    "+++ t/checkout/smerge/me\t(local)",
+     __("--- t/checkout/smerge/me\t(revision 9)"),
+     __("+++ t/checkout/smerge/me\t(local)"),
     '@@ -1,2 +1,3 @@',
     ' first line in me',
     ' 2nd line in me - mod',

Modified: trunk/t/23commit-local-file-to-add.t
==============================================================================
--- trunk/t/23commit-local-file-to-add.t	(original)
+++ trunk/t/23commit-local-file-to-add.t	Thu Jul 31 18:40:22 2008
@@ -10,10 +10,10 @@
 chdir($copath);
 is_output ($svk, 'checkout', ['//V/A'],
 	   ["Syncing //V/A(/V/A) in ".__"$corpath/A to 3.",
-	    'A   A/Q',
-	    'A   A/Q/qu',
-	    'A   A/Q/qz',
-	    'A   A/be']);
+	    __('A   A/Q'),
+	    __('A   A/Q/qu'),
+            __('A   A/Q/qz'),
+            __('A   A/be')]);
 
 ok (-e 'A/Q/qu');
 
@@ -23,9 +23,9 @@
 
 chdir('A');
 is_output($svk, 'status', [],
-	  ['M   Q/qu',
-	   'M   Q/qz',
-	   '?   boo']);
+	  [__('M   Q/qu'),
+	   __('M   Q/qz'),
+	   __('?   boo')]);
 
 sub set_editor_add
 {

Modified: trunk/t/29update-merge-ticket.t
==============================================================================
--- trunk/t/29update-merge-ticket.t	(original)
+++ trunk/t/29update-merge-ticket.t	Thu Jul 31 18:40:22 2008
@@ -32,10 +32,10 @@
 $svk->up ($copath);
 is_output($svk, 'diff', [$copath],
     [
-    '=== t/checkout/smerge/me',
+     __('=== t/checkout/smerge/me'),
     '==================================================================',
-    "--- t/checkout/smerge/me\t(revision 8)",
-    "+++ t/checkout/smerge/me\t(local)",
+     __("--- t/checkout/smerge/me\t(revision 8)"),
+     __("+++ t/checkout/smerge/me\t(local)"),
     '@@ -1,2 +1,3 @@',
     ' first line in me',
     ' 2nd line in me - mod',

Modified: trunk/t/29update-props.t
==============================================================================
--- trunk/t/29update-props.t	(original)
+++ trunk/t/29update-props.t	Thu Jul 31 18:40:22 2008
@@ -25,11 +25,11 @@
     $svk->ps ('prop', 'value', "$copath/me");
     is_output($svk, 'up', ['-C', $copath], [
         "Syncing //trunk(/trunk) in $corpath to 4.",
-        " g  t/checkout/smerge/me",
+        __(" g  t/checkout/smerge/me"),
     ] );
     is_output($svk, 'up', [$copath], [
         "Syncing //trunk(/trunk) in $corpath to 4.",
-        " g  t/checkout/smerge/me",
+       __( " g  t/checkout/smerge/me"),
     ] );
     is_output($svk, 'st', [$copath], [
     ] );
@@ -44,18 +44,18 @@
     $svk->ps ('another-prop', 'value', "$copath/me");
     is_output($svk, 'up', ['-C', $copath], [
         "Syncing //trunk(/trunk) in $corpath to 4.",
-        " U  t/checkout/smerge/me",
+        __(" U  t/checkout/smerge/me"),
     ] );
     is_output($svk, 'up', [$copath], [
         "Syncing //trunk(/trunk) in $corpath to 4.",
-        " U  t/checkout/smerge/me",
+        __(" U  t/checkout/smerge/me"),
     ] );
     is_output($svk, 'st', [$copath], [
-        " M  t/checkout/smerge/me",
+        __(" M  t/checkout/smerge/me"),
     ] );
     is_output($svk, 'di', [$copath], [
         "",
-        "Property changes on: $copath/me",
+        __("Property changes on: $copath/me"),
         "___________________________________________________________________",
         "Name: another-prop",
         " +value",
@@ -70,22 +70,22 @@
     $svk->ps ('prop', 'another-value', "$copath/me");
     is_output($svk, 'up', ['-C', $copath], [
         "Syncing //trunk(/trunk) in $corpath to 4.",
-        " C  t/checkout/smerge/me",
+        __(" C  t/checkout/smerge/me"),
         "1 conflict found.",
     ] );
     is_output($svk, 'up', [$copath], [
         "Syncing //trunk(/trunk) in $corpath to 4.",
-        " C  t/checkout/smerge/me",
+        __(" C  t/checkout/smerge/me"),
         "1 conflict found.",
     ] );
     is_output($svk, 'st', [$copath], [
-        " C  t/checkout/smerge/me",
+        __(" C  t/checkout/smerge/me"),
     ] );
 
     # XXX: this looks wierd a littl without line endings
     is_output($svk, 'di', [$copath], [
         "",
-        "Property changes on: $copath/me",
+        __("Property changes on: $copath/me"),
         "___________________________________________________________________",
         "Name: prop",
         " -value",
@@ -112,11 +112,11 @@
     $svk->ps ('prop', 'value', "$copath/A");
     is_output($svk, 'up', ['-C', $copath], [
         "Syncing //trunk(/trunk) in $corpath to 5.",
-        " g  t/checkout/smerge/A",
+        __(" g  t/checkout/smerge/A"),
     ] );
     is_output($svk, 'up', [$copath], [
         "Syncing //trunk(/trunk) in $corpath to 5.",
-        " g  t/checkout/smerge/A",
+        __(" g  t/checkout/smerge/A"),
     ] );
     is_output($svk, 'st', [$copath], [
     ] );
@@ -131,18 +131,18 @@
     $svk->ps ('another-prop', 'value', "$copath/A");
     is_output($svk, 'up', ['-C', $copath], [
         "Syncing //trunk(/trunk) in $corpath to 5.",
-        " U  t/checkout/smerge/A",
+        __(" U  t/checkout/smerge/A"),
     ] );
     is_output($svk, 'up', [$copath], [
         "Syncing //trunk(/trunk) in $corpath to 5.",
-        " U  t/checkout/smerge/A",
+        __(" U  t/checkout/smerge/A"),
     ] );
     is_output($svk, 'st', [$copath], [
-        " M  t/checkout/smerge/A",
+        __(" M  t/checkout/smerge/A"),
     ] );
     is_output($svk, 'di', [$copath], [
         "",
-        "Property changes on: $copath/A",
+        __("Property changes on: $copath/A"),
         "___________________________________________________________________",
         "Name: another-prop",
         " +value",
@@ -157,22 +157,22 @@
     $svk->ps ('prop', 'another-value', "$copath/A");
     is_output($svk, 'up', ['-C', $copath], [
         "Syncing //trunk(/trunk) in $corpath to 5.",
-        " C  t/checkout/smerge/A",
+        __(" C  t/checkout/smerge/A"),
         "1 conflict found.",
     ] );
     is_output($svk, 'up', [$copath], [
         "Syncing //trunk(/trunk) in $corpath to 5.",
-        " C  t/checkout/smerge/A",
+        __(" C  t/checkout/smerge/A"),
         "1 conflict found.",
     ] );
     is_output($svk, 'st', [$copath], [
-        " C  t/checkout/smerge/A",
+        __(" C  t/checkout/smerge/A"),
     ] );
 
     # XXX: this looks wierd a littl without line endings
     is_output($svk, 'di', [$copath], [
         "",
-        "Property changes on: $copath/A",
+        __("Property changes on: $copath/A"),
         "___________________________________________________________________",
         "Name: prop",
         " -value",
@@ -194,7 +194,7 @@
     is_output($svk, 'up', ['-C', $copath], [
         #XXX, TODO: why it's corpath instead copath?
         "Syncing //trunk(/trunk) in $corpath to 4.",
-        " U  t/checkout/smerge/me",
+        __(" U  t/checkout/smerge/me"),
     ] );
     is_output($svk, 'st', [$copath], [
     ] );
@@ -209,7 +209,7 @@
     is_output($svk, 'up', ['-C', $copath], [
         #XXX, TODO: why it's corpath instead copath?
         "Syncing //trunk(/trunk) in $corpath to 5.",
-        " U  t/checkout/smerge/A",
+        __(" U  t/checkout/smerge/A"),
     ] );
     is_output($svk, 'st', [$copath], [
     ] );


More information about the svk-commit mailing list