[svk-commit] r2319 - trunk/t

[nobody at bestpractical.com]

Author: mb
Date: Thu Mar  8 20:08:03 2007
New Revision: 2319

Modified:
   trunk/t/07smerge-mixanchor.t

Log:
Fixed so that the test succeeds 100% of the time instead of 50% of the
time.  It was failing because, although merge tickets are sorted,
repository uuids are random and therefore merge tickets from one
repository would randomly end up either before of after the ones from
the other repository.

Modified: trunk/t/07smerge-mixanchor.t
==============================================================================
--- trunk/t/07smerge-mixanchor.t	(original)
+++ trunk/t/07smerge-mixanchor.t	Thu Mar  8 20:08:03 2007
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 use strict;
 use SVK::Test;
-plan tests => 3;
+plan tests => 4;
 
 our $output;
 # build another tree to be mirrored ourself
@@ -46,11 +46,13 @@
 	    'Retrieving log information from 8 to 8',
 	    'Committed revision 15 from revision 8.']);
 
-is_output ($svk, 'pg', ['svk:merge', '//local/3.3-TESTING', '//mirror/3.3-TESTING'],
-	   ["//local/3.3-TESTING - $uuid:/3.3-exp:11",
+is_sorted_output ($svk, 'pg', ['svk:merge', '//local/3.3-TESTING'],
+	   ["$uuid:/3.3-exp:11",
 	    "$suuid:/3.3-TESTING:7",
-	    "$suuid:/trunk:3",
-	    "//mirror/3.3-TESTING - $uuid:/3.3-exp:11",
+	    "$suuid:/trunk:3"]);
+
+is_sorted_output ($svk, 'pg', ['svk:merge', '//mirror/3.3-TESTING'],
+	   ["$uuid:/3.3-exp:11",
 	    "$suuid:/3.3-TESTING:7",
 	    "$suuid:/trunk:3"]);