Merge lp:~pedronis/u1db/more-freedom-for-backends into lp:u1db

[Samuele Pedroni]

more freedom for backends reusing the ref tests:
- split out the tests for *validate* methods which are partly internal details
- support setting accept_fixed_trans_id on DatabaseBaseTests subclasses to allow a backend to always use '' for trans_ids as checked by assertTransactionLog,

more freedom for backends reusing the reftests:

- split out the tests for *validate* methods which are partly internal details

- support setting accept_fixed_trans_id on DatabaseBaseTests subclasses to allow a backend to always use '' for trans_ids as checked by assertTransactionLog,

to test the latter: apply locally the diff

=== modified file 'u1db/tests/test_backends.py'
--- u1db/tests/test_backends.py 2012-07-03 21:34:14 +0000
+++ u1db/tests/test_backends.py 2012-07-03 21:42:44 +0000
@@ -476,6 +476,12 @@
             self.db._get_replica_gen_and_trans_id('other-db'))

     def test_put_updates_transaction_log(self):
+ if 'InMemory' in self.db.__class__.__name__:
+ def fixed():
+ print "FIXED"
+ return ''
+ self.db._allocate_transaction_id = fixed
+ self.accept_fixed_trans_id = True
         doc = self.db.create_doc(simple_doc)
         self.assertTransactionLog([doc.doc_id], self.db)
         doc.set_json('{"something": "else"}')

make check should still pass printing FIXED twice

[lp:~pedronis/u1db/more-freedom-for-backends]

344. By Samuele Pedroni on 2012-07-03

rename test with wrong/repeated name

[Eric Casteleijn (thisfred)]

Works as advertised. Code looks good, with the duplicate test remained (sorry, my fault)

review: Approve

=== modified file 'u1db/tests/__init__.py'
--- u1db/tests/__init__.py	2012-06-29 16:18:14 +0000
+++ u1db/tests/__init__.py	2012-07-03 22:26:17 +0000
@@ -162,6 +162,9 @@
 
 class DatabaseBaseTests(TestCase):
 
+    accept_fixed_trans_id = False  # set to True assertTransactionLog
+                                   # is happy with all trans ids = ''
+
     scenarios = LOCAL_DATABASES_SCENARIOS
 
     def create_database(self, replica_uid):
@@ -185,6 +188,8 @@
             just_ids.append(doc_id)
             self.assertIsNot(None, transaction_id,
                              "Transaction id should not be None")
+            if transaction_id == '' and self.accept_fixed_trans_id:
+                continue
             self.assertNotEqual('', transaction_id,
                                 "Transaction id should be a unique string")
             self.assertTrue(transaction_id.startswith('T-'))

=== modified file 'u1db/tests/test_backends.py'
--- u1db/tests/test_backends.py	2012-07-03 13:50:27 +0000
+++ u1db/tests/test_backends.py	2012-07-03 22:26:17 +0000
@@ -437,67 +437,6 @@
             self.db._put_doc_if_newer, doc, save_conflict=False,
             replica_uid='other', replica_gen=1, replica_trans_id='T-sad')
 
-    def test_validate_gen_and_trans_id(self):
-        self.db.create_doc(simple_doc)
-        gen, trans_id = self.db._get_generation_info()
-        self.db.validate_gen_and_trans_id(gen, trans_id)
-
-    def test_validate_gen_and_trans_id_invalid_txid(self):
-        self.db.create_doc(simple_doc)
-        gen, _ = self.db._get_generation_info()
-        self.assertRaises(
-            errors.InvalidTransactionId,
-            self.db.validate_gen_and_trans_id, gen, 'wrong')
-
-    def test_validate_gen_and_trans_id_invalid_txid(self):
-        self.db.create_doc(simple_doc)
-        gen, trans_id = self.db._get_generation_info()
-        self.assertRaises(
-            errors.InvalidGeneration,
-            self.db.validate_gen_and_trans_id, gen + 1, trans_id)
-
-    def test_validate_source_gen_and_trans_id_same(self):
-        self.db._set_replica_gen_and_trans_id('other', 1, 'T-sid')
-        v1 = vectorclock.VectorClockRev('other:1|self:1')
-        v2 = vectorclock.VectorClockRev('other:1|self:1')
-        self.assertEqual(
-            'superseded',
-            self.db._validate_source('other', 1, 'T-sid', v1, v2))
-
-    def test_validate_source_gen_newer(self):
-        self.db._set_replica_gen_and_trans_id('other', 1, 'T-sid')
-        v1 = vectorclock.VectorClockRev('other:1|self:1')
-        v2 = vectorclock.VectorClockRev('other:2|self:2')
-        self.assertEqual(
-            'ok',
-            self.db._validate_source('other', 2, 'T-whatevs', v1, v2))
-
-    def test_validate_source_wrong_txid(self):
-        self.db._set_replica_gen_and_trans_id('other', 1, 'T-sid')
-        v1 = vectorclock.VectorClockRev('other:1|self:1')
-        v2 = vectorclock.VectorClockRev('other:2|self:2')
-        self.assertRaises(
-            errors.InvalidTransactionId,
-            self.db._validate_source, 'other', 1, 'T-sad', v1, v2)
-
-    def test_validate_source_gen_older_and_vcr_older(self):
-        self.db._set_replica_gen_and_trans_id('other', 1, 'T-sid')
-        self.db._set_replica_gen_and_trans_id('other', 2, 'T-sod')
-        v1 = vectorclock.VectorClockRev('other:1|self:1')
-        v2 = vectorclock.VectorClockRev('other:2|self:2')
-        self.assertEqual(
-            'superseded',
-            self.db._validate_source('other', 1, 'T-sid', v2, v1))
-
-    def test_validate_source_gen_older_vcr_newer(self):
-        self.db._set_replica_gen_and_trans_id('other', 1, 'T-sid')
-        self.db._set_replica_gen_and_trans_id('other', 2, 'T-sod')
-        v1 = vectorclock.VectorClockRev('other:1|self:1')
-        v2 = vectorclock.VectorClockRev('other:2|self:2')
-        self.assertRaises(
-            errors.InvalidGeneration,
-            self.db._validate_source, 'other', 1, 'T-sid', v1, v2)
-
     def test_put_doc_if_newer_replica_uid(self):
         doc1 = self.db.create_doc(simple_doc)
         self.db._set_replica_gen_and_trans_id('other', 1, 'T-sid')
@@ -588,6 +527,77 @@
                          self.db.whats_changed(2))
 
 
+class LocalDatabaseValidateGenNTransIdTests(tests.DatabaseBaseTests):
+
+    scenarios = tests.LOCAL_DATABASES_SCENARIOS + tests.C_DATABASE_SCENARIOS
+
+    def test_validate_gen_and_trans_id(self):
+        self.db.create_doc(simple_doc)
+        gen, trans_id = self.db._get_generation_info()
+        self.db.validate_gen_and_trans_id(gen, trans_id)
+
+    def test_validate_gen_and_trans_id_invalid_txid(self):
+        self.db.create_doc(simple_doc)
+        gen, _ = self.db._get_generation_info()
+        self.assertRaises(
+            errors.InvalidTransactionId,
+            self.db.validate_gen_and_trans_id, gen, 'wrong')
+
+    def test_validate_gen_and_trans_id_invalid_gen(self):
+        self.db.create_doc(simple_doc)
+        gen, trans_id = self.db._get_generation_info()
+        self.assertRaises(
+            errors.InvalidGeneration,
+            self.db.validate_gen_and_trans_id, gen + 1, trans_id)
+
+
+class LocalDatabaseValidateSourceGenTests(tests.DatabaseBaseTests):
+
+    scenarios = tests.LOCAL_DATABASES_SCENARIOS + tests.C_DATABASE_SCENARIOS
+
+    def test_validate_source_gen_and_trans_id_same(self):
+        self.db._set_replica_gen_and_trans_id('other', 1, 'T-sid')
+        v1 = vectorclock.VectorClockRev('other:1|self:1')
+        v2 = vectorclock.VectorClockRev('other:1|self:1')
+        self.assertEqual(
+            'superseded',
+            self.db._validate_source('other', 1, 'T-sid', v1, v2))
+
+    def test_validate_source_gen_newer(self):
+        self.db._set_replica_gen_and_trans_id('other', 1, 'T-sid')
+        v1 = vectorclock.VectorClockRev('other:1|self:1')
+        v2 = vectorclock.VectorClockRev('other:2|self:2')
+        self.assertEqual(
+            'ok',
+            self.db._validate_source('other', 2, 'T-whatevs', v1, v2))
+
+    def test_validate_source_wrong_txid(self):
+        self.db._set_replica_gen_and_trans_id('other', 1, 'T-sid')
+        v1 = vectorclock.VectorClockRev('other:1|self:1')
+        v2 = vectorclock.VectorClockRev('other:2|self:2')
+        self.assertRaises(
+            errors.InvalidTransactionId,
+            self.db._validate_source, 'other', 1, 'T-sad', v1, v2)
+
+    def test_validate_source_gen_older_and_vcr_older(self):
+        self.db._set_replica_gen_and_trans_id('other', 1, 'T-sid')
+        self.db._set_replica_gen_and_trans_id('other', 2, 'T-sod')
+        v1 = vectorclock.VectorClockRev('other:1|self:1')
+        v2 = vectorclock.VectorClockRev('other:2|self:2')
+        self.assertEqual(
+            'superseded',
+            self.db._validate_source('other', 1, 'T-sid', v2, v1))
+
+    def test_validate_source_gen_older_vcr_newer(self):
+        self.db._set_replica_gen_and_trans_id('other', 1, 'T-sid')
+        self.db._set_replica_gen_and_trans_id('other', 2, 'T-sod')
+        v1 = vectorclock.VectorClockRev('other:1|self:1')
+        v2 = vectorclock.VectorClockRev('other:2|self:2')
+        self.assertRaises(
+            errors.InvalidGeneration,
+            self.db._validate_source, 'other', 1, 'T-sid', v1, v2)
+
+
 class LocalDatabaseWithConflictsTests(tests.DatabaseBaseTests):
     # test supporting/functionality around storing conflicts