Skip to content

Commit ec5e05f

Browse files
author
Xavier Grand
committed
test(MCM): fix python2 compat
1 parent 30c0f98 commit ec5e05f

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

tests/test_MCM.py

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import unittest
1313

1414
from algoliasearch.client import Client, MAX_API_KEY_LENGTH, RequestOptions
15-
from algoliasearch.helpers import AlgoliaException
15+
from algoliasearch.helpers import AlgoliaException,PY2
1616

1717
from .helpers import safe_index_name
1818
from .helpers import get_api_client
@@ -38,14 +38,18 @@ def setUpClass(cls):
3838
apiproxy_stub_map.apiproxy.RegisterStub('urlfetch', urlfetch_stub.URLFetchServiceStub())
3939
cls.client = Client(os.environ['ALGOLIA_APPLICATION_ID_MCM'],
4040
os.environ['ALGOLIA_API_KEY_MCM'])
41+
if PY2:
42+
cls.strType = unicode
43+
else:
44+
cls.strType = str
4145

4246
def test_1_list_clusters(self):
4347
answer = self.client.list_clusters()
4448

4549
self.assertTrue(isinstance(answer, dict))
4650
self.assertTrue(isinstance(answer['clusters'], list))
4751
self.assertTrue(len(answer['clusters']) > 0)
48-
self.assertTrue(isinstance(answer['clusters'][0]['clusterName'], str))
52+
self.assertTrue(isinstance(answer['clusters'][0]['clusterName'], self.strType))
4953
self.assertTrue(isinstance(answer['clusters'][0]['nbRecords'], int))
5054
self.assertTrue(isinstance(answer['clusters'][0]['nbUserIDs'], int))
5155
self.assertTrue(isinstance(answer['clusters'][0]['dataSize'], int))
@@ -55,7 +59,7 @@ def test_2_assign_user_id(self):
5559
answer = self.client.assign_user_id(self.uniq_user_id('python-client'), clusterName)
5660

5761
self.assertTrue(isinstance(answer, dict))
58-
self.assertTrue(isinstance(answer['createdAt'], str))
62+
self.assertTrue(isinstance(answer['createdAt'], self.strType))
5963
time.sleep(2) # Sleep to let the cluster publish the change
6064

6165
def test_3_list_user_ids(self):
@@ -65,8 +69,8 @@ def test_3_list_user_ids(self):
6569
self.assertTrue(isinstance(answer, dict))
6670
self.assertTrue(isinstance(answer['userIDs'], list))
6771
self.assertTrue(len(answer['userIDs']) > 0)
68-
self.assertTrue(isinstance(answer['userIDs'][0]['userID'], str))
69-
self.assertTrue(isinstance(answer['userIDs'][0]['clusterName'], str))
72+
self.assertTrue(isinstance(answer['userIDs'][0]['userID'], self.strType))
73+
self.assertTrue(isinstance(answer['userIDs'][0]['clusterName'], self.strType))
7074
self.assertTrue(isinstance(answer['userIDs'][0]['nbRecords'], int))
7175
self.assertTrue(isinstance(answer['userIDs'][0]['dataSize'], int))
7276

@@ -78,16 +82,16 @@ def test_4_get_top_user_id(self):
7882
self.assertTrue(isinstance(answer['topUsers'], dict))
7983
self.assertTrue(len(answer['topUsers']) > 0)
8084
self.assertTrue(isinstance(answer['topUsers'][clusterName], list))
81-
self.assertTrue(isinstance(answer['topUsers'][clusterName][0]['userID'], str))
85+
self.assertTrue(isinstance(answer['topUsers'][clusterName][0]['userID'], self.strType))
8286
self.assertTrue(isinstance(answer['topUsers'][clusterName][0]['nbRecords'], int))
8387
self.assertTrue(isinstance(answer['topUsers'][clusterName][0]['dataSize'], int))
8488

8589
def test_5_get_user_id(self):
8690
answer = self.client.get_user_id(self.uniq_user_id('python-client'))
8791

8892
self.assertTrue(isinstance(answer, dict))
89-
self.assertTrue(isinstance(answer['userID'], str))
90-
self.assertTrue(isinstance(answer['clusterName'], str))
93+
self.assertTrue(isinstance(answer['userID'], self.strType))
94+
self.assertTrue(isinstance(answer['clusterName'], self.strType))
9195
self.assertTrue(isinstance(answer['nbRecords'], int))
9296
self.assertTrue(isinstance(answer['dataSize'], int))
9397

@@ -102,8 +106,8 @@ def test_6_search_user_ids(self):
102106
self.assertTrue(isinstance(answer['hitsPerPage'], int))
103107
self.assertTrue(isinstance(answer['hits'], list))
104108
self.assertTrue(len(answer['hits']) > 0)
105-
self.assertTrue(isinstance(answer['hits'][0]['userID'], str))
106-
self.assertTrue(isinstance(answer['hits'][0]['clusterName'], str))
109+
self.assertTrue(isinstance(answer['hits'][0]['userID'], self.strType))
110+
self.assertTrue(isinstance(answer['hits'][0]['clusterName'], self.strType))
107111
self.assertTrue(isinstance(answer['hits'][0]['nbRecords'], int))
108112
self.assertTrue(isinstance(answer['hits'][0]['dataSize'], int))
109113

@@ -112,7 +116,7 @@ def test_7_remove_user_id(self):
112116

113117
print(answer)
114118
self.assertTrue(isinstance(answer, dict))
115-
self.assertTrue(isinstance(answer['deletedAt'], str))
119+
self.assertTrue(isinstance(answer['deletedAt'], self.strType))
116120

117121

118122

0 commit comments

Comments
 (0)