Merge pull request #265 from cloudant/fix-failing-tests

Fix failing tests

Author: smithsz

test-requirements.txt

@@ -2,3 +2,4 @@ mock==1.3.0
 nose
 sphinx
 pylint
+flaky

tests/unit/database_tests.py

@@ -1449,35 +1449,24 @@ def test_get_search_result_executes_search_query(self):
             limit=5,
             include_docs=True
         )
-        self.assertEqual(len(resp['rows']), 5)
+        self.assertEqual(5, len(resp['rows']))
         self.assertTrue(resp['bookmark'])
-        resp.pop('bookmark')
-        for row in resp['rows']:
-            self.assertTrue(row['doc']['_rev'].startswith('1-'))
-            row['doc'].pop('_rev')
-        self.assertEqual(
-            resp,
-            {'rows': [{'fields': {'name': 'julia'}, 'doc': {'_id': 'julia000',
-                                                            'age': 0,
-                                                            'name': 'julia'},
-                       'id': 'julia000', 'order': ['julia000', 0]},
-                      {'fields': {'name': 'julia'}, 'doc': {'_id': 'julia001',
-                                                            'age': 1,
-                                                            'name': 'julia'},
-                       'id': 'julia001', 'order': ['julia001', 0]},
-                      {'fields': {'name': 'julia'},'doc': {'_id': 'julia002',
-                                                           'age': 2,
-                                                           'name': 'julia'},
-                       'id': 'julia002', 'order': ['julia002', 0]},
-                      {'fields': {'name': 'julia'}, 'doc': {'_id': 'julia003',
-                                                            'age': 3,
-                                                            'name': 'julia'},
-                       'id': 'julia003', 'order': ['julia003', 0]},
-                      {'fields': {'name': 'julia'},
-                       'doc': {'_id': 'julia004', 'age': 4,
-                               'name': 'julia'},
-                       'id': 'julia004', 'order': ['julia004', 1]}], 'total_rows': 100}
-        )
+
+        for i, row in enumerate(resp['rows']):
+            doc_id = 'julia00{0}'.format(i)
+
+            self.assertEqual(doc_id, row['id'])
+            self.assertEqual('julia', row['fields']['name'])
+
+            # Note: The second element in the order array can be ignored. It is
+            # used for troubleshooting purposes only.
+            self.assertEqual(doc_id, row['order'][0])
+
+            doc = row['doc']
+            self.assertEqual(doc_id, doc['_id'])
+            self.assertTrue(doc['_rev'].startswith('1-'))
+            self.assertEqual(i, doc['age'])
+            self.assertEqual('julia', doc['name'])
 
     def test_get_search_result_executes_search_q(self):
         """
@@ -1492,14 +1481,19 @@ def test_get_search_result_executes_search_q(self):
             sort='_id<string>',
             limit=1
         )
-        self.assertEqual(len(resp['rows']), 1)
+
         self.assertTrue(resp['bookmark'])
-        resp.pop('bookmark')
-        self.assertEqual(
-            resp,
-            {'rows': [{'fields': {'name': 'julia'}, 'id': 'julia000',
-                       'order': ['julia000', 0]}], 'total_rows': 100}
-        )
+        self.assertEqual(100, resp['total_rows'])
+        self.assertEqual(1, len(resp['rows']))
+
+        row = resp['rows'][0]
+        self.assertEqual('julia000', row['id'])
+
+        # Note: The second element in the order array can be ignored. It is
+        # used for troubleshooting purposes only.
+        self.assertEqual('julia000', row['order'][0])
+
+        self.assertEqual('julia', row['fields']['name'])
 
     def test_get_search_result_executes_search_query_with_group_option(self):
         """
@@ -1517,26 +1511,23 @@ def test_get_search_result_executes_search_query_with_group_option(self):
         )
         # for group parameter options, 'rows' results are within 'groups' key
         self.assertEqual(len(resp['groups']), 5)
-        self.assertEqual(
-            resp,
-            {'total_rows': 100, 'groups': [
-                {'rows': [{'fields': {'name': 'julia'}, 'id': 'julia000',
-                           'order': [1.0, 0]}], 'total_rows': 1,
-                 'by': 'julia000'},
-                {'rows': [{'fields': {'name': 'julia'}, 'id': 'julia001',
-                           'order': [1.0, 0]}], 'total_rows': 1,
-                 'by': 'julia001'},
-                {'rows': [{'fields': {'name': 'julia'}, 'id': 'julia002',
-                           'order': [1.0, 0]}], 'total_rows': 1,
-                 'by': 'julia002'},
-                {'rows': [{'fields': {'name': 'julia'}, 'id': 'julia003',
-                           'order': [1.0, 0]}], 'total_rows': 1,
-                 'by': 'julia003'},
-                {'rows': [{'fields': {'name': 'julia'}, 'id': 'julia004',
-                           'order': [1.0, 1]}], 'total_rows': 1,
-                 'by': 'julia004'}
-            ]}
-        )
+
+        for i, group in enumerate(resp['groups']):
+            by_id = 'julia00{0}'.format(i)
+
+            self.assertEqual(by_id, group['by'])
+            self.assertEqual(1, group['total_rows'])
+            self.assertEqual(1, len(group['rows']))
+
+            row = group['rows'][0]
+            self.assertEqual(by_id, row['id'])
+            self.assertEqual('julia', row['fields']['name'])
+
+            # Note: The second element in the order array can be ignored. It is
+            # used for troubleshooting purposes only.
+            self.assertEqual(1.0, row['order'][0])
+
+        self.assertEqual(100, resp['total_rows'])
 
 if __name__ == '__main__':
     unittest.main()

tests/unit/replicator_tests.py

@@ -27,6 +27,8 @@
 import time
 import requests
 
+from flaky import flaky
+
 from cloudant.replicator import Replicator
 from cloudant.document import Document
 from cloudant.error import CloudantReplicatorException, CloudantClientException
@@ -154,6 +156,7 @@ def test_replication_with_generated_id(self):
         clone = Replicator(self.client)
         clone.create_replication(self.db, self.target_db)
 
+    @flaky(max_runs=3)
     def test_create_replication(self):
         """
         Test that the replication document gets created and that the