Fixed listing

openprocurement · Apr 25, 2016 · 82d7548 · 82d7548
1 parent 1406f0b
commit 82d7548
Showing 1 changed file with 32 additions and 10 deletions.
diff --git a/openprocurement/tender/limited/tests/tender.py b/openprocurement/tender/limited/tests/tender.py
@@ -165,16 +165,26 @@ def test_listing(self):
             self.assertEqual(response.content_type, 'application/json')
             tenders.append(response.json['data'])
 
-        response = self.app.get('/tenders')
-        self.assertEqual(response.status, '200 OK')
+
+        ids = ','.join([i['id'] for i in tenders])
+
+        while True:
+            response = self.app.get('/tenders')
+            self.assertTrue(ids.startswith(','.join([i['id'] for i in response.json['data']])))
+            if len(response.json['data']) == 3:
+                break
+
         self.assertEqual(len(response.json['data']), 3)
         self.assertEqual(set(response.json['data'][0]), set([u'id', u'dateModified']))
         self.assertEqual(set([i['id'] for i in response.json['data']]), set([i['id'] for i in tenders]))
         self.assertEqual(set([i['dateModified'] for i in response.json['data']]), set([i['dateModified'] for i in tenders]))
         self.assertEqual([i['dateModified'] for i in response.json['data']], sorted([i['dateModified'] for i in tenders]))
 
-        response = self.app.get('/tenders?offset={}'.format(offset))
-        self.assertEqual(response.status, '200 OK')
+        while True:
+            response = self.app.get('/tenders?offset={}'.format(offset))
+            self.assertEqual(response.status, '200 OK')
+            if len(response.json['data']) == 1:
+                break
         self.assertEqual(len(response.json['data']), 1)
 
         response = self.app.get('/tenders?limit=2')
@@ -233,8 +243,11 @@ def test_listing(self):
         self.assertEqual(response.status, '201 Created')
         self.assertEqual(response.content_type, 'application/json')
 
-        response = self.app.get('/tenders?mode=test')
-        self.assertEqual(response.status, '200 OK')
+        while True:
+            response = self.app.get('/tenders?mode=test')
+            self.assertEqual(response.status, '200 OK')
+            if len(response.json['data']) == 1:
+                break
         self.assertEqual(len(response.json['data']), 1)
 
         response = self.app.get('/tenders?mode=_all_')
@@ -254,8 +267,14 @@ def test_listing_changes(self):
             self.assertEqual(response.content_type, 'application/json')
             tenders.append(response.json['data'])
 
-        response = self.app.get('/tenders?feed=changes')
-        self.assertEqual(response.status, '200 OK')
+        ids = ','.join([i['id'] for i in tenders])
+
+        while True:
+            response = self.app.get('/tenders?feed=changes')
+            self.assertTrue(ids.startswith(','.join([i['id'] for i in response.json['data']])))
+            if len(response.json['data']) == 3:
+                break
+
         self.assertEqual(len(response.json['data']), 3)
         self.assertEqual(set(response.json['data'][0]), set([u'id', u'dateModified']))
         self.assertEqual(set([i['id'] for i in response.json['data']]), set([i['id'] for i in tenders]))
@@ -318,8 +337,11 @@ def test_listing_changes(self):
         self.assertEqual(response.status, '201 Created')
         self.assertEqual(response.content_type, 'application/json')
 
-        response = self.app.get('/tenders?feed=changes&mode=test')
-        self.assertEqual(response.status, '200 OK')
+        while True:
+            response = self.app.get('/tenders?feed=changes&mode=test')
+            self.assertEqual(response.status, '200 OK')
+            if len(response.json['data']) == 1:
+                break
         self.assertEqual(len(response.json['data']), 1)
 
         response = self.app.get('/tenders?feed=changes&mode=_all_')