Additional test s(and lint)

Author: eskombro

meilisearch/client.py

@@ -103,9 +103,9 @@ def get_or_create_index(self, uid, options=None):
         try:
             index = Index(self.config, uid)
             index.create(self.config, uid, options)
-        except MeiliSearchApiError as e:
-            if e.message != 'index already exists':
-                raise e
+        except MeiliSearchApiError as err:
+            if err.message != 'index already exists':
+                raise err
             index = self.get_index(uid)
         return index
 

meilisearch/tests/index/test_index.py

@@ -10,6 +10,7 @@ class TestIndex:
     index_uid = 'indexUID'
     index_uid2 = 'indexUID2'
     index_uid3 = 'indexUID3'
+    index_uid4 = 'indexUID4'
 
     def setup_class(self):
         clear_all_indexes(self.client)
@@ -58,12 +59,13 @@ def test_get_index_with_none_uid(self):
 
     def test_get_or_create_index(self):
         """Test get_or_create_index method"""
-        index_1 = self.client.get_or_create_index('book_id')
-        index_2 = self.client.get_or_create_index('book_id')
-        index_3 = self.client.get_or_create_index('book_id')
-        assert index_1.uid == index_2.uid == index_3.uid == 'book_id'
+        # self.client.create_index(self.index_uid3)
+        index_1 = self.client.get_or_create_index(self.index_uid4)
+        index_2 = self.client.get_or_create_index(self.index_uid4)
+        index_3 = self.client.get_or_create_index(self.index_uid4)
+        assert index_1.uid == index_2.uid == index_3.uid == self.index_uid4
         update = index_1.add_documents([{
-            'id': 1,
+            'book_id': 1,
             'name': "Some book"
         }])
         index_1.wait_for_pending_update(update['updateId'])
@@ -73,6 +75,14 @@ def test_get_or_create_index(self):
         with pytest.raises(Exception):
             self.client.get_index(index_3).info()
 
+    def test_get_or_create_index_with_primary_key(self):
+        """Test get_or_create_index method with primary key"""
+        index_1 = self.client.get_or_create_index('books', {'primaryKey': self.index_uid4})
+        index_2 = self.client.get_or_create_index('books', {'primaryKey': 'some_wrong_key'})
+        assert index_1.get_primary_key() == self.index_uid4
+        assert index_2.get_primary_key() == self.index_uid4
+        index_1.delete()
+
     def test_index_info(self):
         """Tests getting an index's info"""
         index = self.client.get_index(uid=self.index_uid)