[Bps-public-commit] r14775 - Prophet/branches/creator/t

[sartak at bestpractical.com]

Author: sartak
Date: Mon Aug  4 19:57:32 2008
New Revision: 14775

Modified:
   Prophet/branches/creator/t/real-conflicting-merge.t
   Prophet/branches/creator/t/simple-push.t

Log:
Since we use is_deeply, we can't really just ignore "created" dates which are unpredictable

Modified: Prophet/branches/creator/t/real-conflicting-merge.t
==============================================================================
--- Prophet/branches/creator/t/real-conflicting-merge.t	(original)
+++ Prophet/branches/creator/t/real-conflicting-merge.t	Mon Aug  4 19:57:32 2008
@@ -173,6 +173,7 @@
                     }
                 },
                 creator              => 'bob',
+                created              => $changesets[0]->created,
                 is_nullification     => 1,
                 is_resolution        => undef,
                 sequence_no          => ( replica_last_rev() - 2 ),
@@ -182,6 +183,7 @@
             },
             {
                 creator              => 'alice',
+                created              => $changesets[1]->created,
                 is_nullification     => undef,
                 is_resolution        => undef,
                 sequence_no          => ( replica_last_rev() - 1 ),
@@ -216,6 +218,7 @@
 
             {
                 creator              => 'bob',
+                created              => $changesets[2]->created,
                 is_nullification     => undef,
                 is_resolution        => 1,
                 sequence_no          => replica_last_rev(),

Modified: Prophet/branches/creator/t/simple-push.t
==============================================================================
--- Prophet/branches/creator/t/simple-push.t	(original)
+++ Prophet/branches/creator/t/simple-push.t	Mon Aug  4 19:57:32 2008
@@ -57,6 +57,7 @@
         {   #'sequence_no'          => 3,
             #'original_sequence_no' => 3, # the number is different on different replica types
             'creator'              => 'bob',
+            'created'              => $changesets->[0]->{created},
             'original_source_uuid' => replica_uuid_for('bob'),
             'is_resolution'        => undef,
             'source_uuid'          => replica_uuid_for('bob'),
@@ -115,6 +116,7 @@
         #     'sequence_no'          => 4,  # the number varies based on replica type
         #    'original_sequence_no' => 4,
             'creator'              => 'bob',
+            'created'              => $changes[0]->{created},
             'original_source_uuid' => replica_uuid_for('bob'),
             'is_resolution'        => undef,
             'source_uuid'          => replica_uuid_for('bob'),