Merge pull request #258 from cloudant/256-fix-intermittent-test-list-replications

Fix unreliable unit tests

Author: smithsz

tests/unit/client_tests.py

@@ -264,14 +264,21 @@ def test_keys(self):
         """
         Test retrieving the list of database names
         """
+        dbs = []
         try:
             self.client.connect()
             self.assertEqual(list(self.client.keys()), [])
-            self.assertEqual(
-                self.client.keys(remote=True),
-                self.client.all_dbs()
-                )
+
+            # create 10 new test dbs
+            for _ in range(10):
+                dbs.append(self.client.create_database(self.dbname()).database_name)
+
+            self.assertTrue(set(dbs).issubset(set(self.client.keys(remote=True))))
+            self.assertTrue(set(dbs).issubset(set(self.client.all_dbs())))
+
         finally:
+            for db in dbs:
+                self.client.delete_database(db)  # remove test db
             self.client.disconnect()
 
     def test_get_non_existing_db_via_getitem(self):

tests/unit/replicator_tests.py

@@ -61,8 +61,22 @@ def tearDown(self):
         self.target_db.delete()
         del self.test_target_dbname
         del self.target_db
-        while self.replication_ids:
-            self.replicator.stop_replication(self.replication_ids.pop())
+
+        for rep_id in self.replication_ids:
+            max_retry = 5
+            while True:
+                try:
+                    self.replicator.stop_replication(rep_id)
+                    break
+
+                except requests.HTTPError as ex:
+                    # Retry failed attempt to delete replication document. It's
+                    # likely in an error state and receiving constant updates
+                    # via the replicator.
+                    max_retry -= 1
+                    if ex.response.status_code != 409 or max_retry == 0:
+                        raise
+
         del self.replicator
         self.db_tear_down()
         super(ReplicatorTests, self).tearDown()