Merge branch 'master' into refactor-storage-client

vesoft-inc · Mar 21, 2022 · 27409c4 · 27409c4
2 parents 0920d62 + e8f9585
commit 27409c4
Show file tree

Hide file tree

Showing 3 changed files with 168 additions and 165 deletions.
diff --git a/tests/admin/test_permission.py b/tests/admin/test_permission.py
@@ -21,51 +21,51 @@ def spawn_nebula_client_and_auth(self, user, password):
             return False, None
 
     @classmethod
-    def prepare(self):
+    def prepare(cls):
         query = 'CREATE USER test WITH PASSWORD "test"'
-        resp = self.execute(query)
-        self.check_resp_succeeded(resp)
-        time.sleep(self.delay)
+        resp = cls.execute(query)
+        cls.check_resp_succeeded(resp)
+        time.sleep(cls.delay * 2)
 
     @classmethod
     def cleanup(self):
-        query = 'DROP USER test'
+        query = 'DROP USER IF EXISTS test'
         resp = self.execute(query)
         self.check_resp_succeeded(resp)
 
-        query = 'DROP USER admin'
+        query = 'DROP USER IF EXISTS admin'
         resp = self.execute(query)
         self.check_resp_succeeded(resp)
 
-        query = 'DROP USER dba'
+        query = 'DROP USER IF EXISTS dba'
         resp = self.execute(query)
         self.check_resp_succeeded(resp)
 
-        query = 'DROP USER user'
+        query = 'DROP USER IF EXISTS user'
         resp = self.execute(query)
         self.check_resp_succeeded(resp)
 
-        query = 'DROP USER guest'
+        query = 'DROP USER IF EXISTS guest'
         resp = self.execute(query)
         self.check_resp_succeeded(resp)
 
-        query = 'DROP SPACE test_permission_space'
+        query = 'DROP SPACE IF EXISTS test_permission_space'
         resp = self.execute(query)
         self.check_resp_succeeded(resp)
 
-        query = 'DROP SPACE space1'
+        query = 'DROP SPACE IF EXISTS space1'
         resp = self.execute(query)
         self.check_resp_succeeded(resp)
 
-        query = 'DROP SPACE space2'
+        query = 'DROP SPACE IF EXISTS space2'
         resp = self.execute(query)
         self.check_resp_succeeded(resp)
 
-        query = 'DROP SPACE space3'
+        query = 'DROP SPACE IF EXISTS space3'
         resp = self.execute(query)
         self.check_resp_succeeded(resp)
 
-        query = 'DROP SPACE space4'
+        query = 'DROP SPACE IF EXISTS space4'
         resp = self.execute(query)
         self.check_resp_succeeded(resp)
 
@@ -163,11 +163,11 @@ def test_user_write(self):
         resp = self.adminClient.execute(query)
         self.check_resp_failed(resp, ttypes.ErrorCode.E_BAD_PERMISSION)
 
-        query = 'DROP USER admin'
+        query = 'DROP USER IF EXISTS admin'
         resp = self.adminClient.execute(query)
         self.check_resp_failed(resp, ttypes.ErrorCode.E_BAD_PERMISSION)
 
-        query = 'DROP USER admin'
+        query = 'DROP USER IF EXISTS admin'
         resp = self.execute(query)
         self.check_resp_succeeded(resp)
 
@@ -806,6 +806,6 @@ def test_show_roles(self):
         self.check_out_of_order_result(resp, expected_result)
 
         # clean up
-        query = 'DROP SPACE space5'
+        query = 'DROP SPACE IF EXISTS space5'
         resp = self.execute(query)
         self.check_resp_succeeded(resp)