Split integration test 'test_grant_and_revoke' into two tests.

tests/integration/test_create_user_and_login/test.py

@@ -0,0 +1,85 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV
+import re
+
+cluster = ClickHouseCluster(__file__)
+instance = cluster.add_instance('instance')
+
+
+@pytest.fixture(scope="module", autouse=True)
+def started_cluster():
+    try:
+        cluster.start()
+        
+        instance.query("CREATE TABLE test_table(x UInt32, y UInt32) ENGINE = MergeTree ORDER BY tuple()")
+        instance.query("INSERT INTO test_table VALUES (1,5), (2,10)")
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+@pytest.fixture(autouse=True)
+def cleanup_after_test():
+    try:
+        yield
+    finally:
+        instance.query("DROP USER IF EXISTS A, B")
+
+
+def test_login():
+    instance.query("CREATE USER A")
+    instance.query("CREATE USER B")
+    assert instance.query("SELECT 1", user='A') == "1\n"
+    assert instance.query("SELECT 1", user='B') == "1\n"
+
+
+def test_grant_and_revoke():
+    instance.query("CREATE USER A")
+    assert "Not enough privileges" in instance.query_and_get_error("SELECT * FROM test_table", user='A')
+    
+    instance.query('GRANT SELECT ON test_table TO A')
+    assert instance.query("SELECT * FROM test_table", user='A') == "1\t5\n2\t10\n"
+
+    instance.query('REVOKE SELECT ON test_table FROM A')
+    assert "Not enough privileges" in instance.query_and_get_error("SELECT * FROM test_table", user='A')
+
+
+def test_grant_option():
+    instance.query("CREATE USER A")
+    instance.query("CREATE USER B")
+
+    instance.query('GRANT SELECT ON test_table TO A')
+    assert instance.query("SELECT * FROM test_table", user='A') == "1\t5\n2\t10\n"
+    assert "Not enough privileges" in instance.query_and_get_error("GRANT SELECT ON test_table TO B", user='A')
+    
+    instance.query('GRANT SELECT ON test_table TO A WITH GRANT OPTION')
+    instance.query("GRANT SELECT ON test_table TO B", user='A')
+    assert instance.query("SELECT * FROM test_table", user='B') == "1\t5\n2\t10\n"
+
+    instance.query('REVOKE SELECT ON test_table FROM A, B')
+
+
+def test_introspection():
+    instance.query("CREATE USER A")
+    instance.query("CREATE USER B")
+    instance.query('GRANT SELECT ON test.table TO A')
+    instance.query('GRANT CREATE ON *.* TO B WITH GRANT OPTION')
+
+    assert instance.query("SHOW USERS") == TSV([ "A", "B", "default" ])
+    assert instance.query("SHOW GRANTS FOR A") == TSV([ "GRANT SELECT ON test.table TO A" ])
+    assert instance.query("SHOW GRANTS FOR B") == TSV([ "GRANT CREATE ON *.* TO B WITH GRANT OPTION" ])
+    
+    assert instance.query("SHOW GRANTS", user='A') == TSV([ "GRANT SELECT ON test.table TO A" ])
+    assert instance.query("SHOW GRANTS", user='B') == TSV([ "GRANT CREATE ON *.* TO B WITH GRANT OPTION" ])
+
+    assert instance.query("SELECT name, storage, auth_type, auth_params, host_ip, host_names, host_names_regexp, host_names_like, default_roles_all, default_roles_list, default_roles_except from system.users WHERE name IN ('A', 'B') ORDER BY name") ==\
+           TSV([[ "A", "disk", "no_password", "[]", "['::/0']", "[]", "[]", "[]", 1, "[]", "[]" ],
+                [ "B", "disk", "no_password", "[]", "['::/0']", "[]", "[]", "[]", 1, "[]", "[]" ]])
+    
+    assert instance.query("SELECT * from system.grants WHERE user_name IN ('A', 'B') ORDER BY user_name, access_type, grant_option") ==\
+           TSV([[ "A",  "\N", "SELECT", "test", "table", "\N", 0, 0 ],
+                [ "B",  "\N", "CREATE", "\N",   "\N",    "\N", 0, 0 ],
+                [ "B",  "\N", "CREATE", "\N",   "\N",    "\N", 0, 1 ]])

tests/integration/test_role/test.py

@@ -22,7 +22,7 @@ def started_cluster():
 
 
 @pytest.fixture(autouse=True)
-def reset_users_and_roles():
+def cleanup_after_test():
     try:
         yield
     finally:
@@ -30,39 +30,6 @@ def reset_users_and_roles():
         instance.query("DROP ROLE IF EXISTS R1, R2")
 
 
-def test_login():
-    instance.query("CREATE USER A")
-    instance.query("CREATE USER B")
-    assert instance.query("SELECT 1", user='A') == "1\n"
-    assert instance.query("SELECT 1", user='B') == "1\n"
-
-
-def test_grant_and_revoke():
-    instance.query("CREATE USER A")
-    assert "Not enough privileges" in instance.query_and_get_error("SELECT * FROM test_table", user='A')
-    
-    instance.query('GRANT SELECT ON test_table TO A')
-    assert instance.query("SELECT * FROM test_table", user='A') == "1\t5\n2\t10\n"
-
-    instance.query('REVOKE SELECT ON test_table FROM A')
-    assert "Not enough privileges" in instance.query_and_get_error("SELECT * FROM test_table", user='A')
-
-
-def test_grant_option():
-    instance.query("CREATE USER A")
-    instance.query("CREATE USER B")
-
-    instance.query('GRANT SELECT ON test_table TO A')
-    assert instance.query("SELECT * FROM test_table", user='A') == "1\t5\n2\t10\n"
-    assert "Not enough privileges" in instance.query_and_get_error("GRANT SELECT ON test_table TO B", user='A')
-    
-    instance.query('GRANT SELECT ON test_table TO A WITH GRANT OPTION')
-    instance.query("GRANT SELECT ON test_table TO B", user='A')
-    assert instance.query("SELECT * FROM test_table", user='B') == "1\t5\n2\t10\n"
-
-    instance.query('REVOKE SELECT ON test_table FROM A, B')
-
-
 def test_create_role():
     instance.query("CREATE USER A")
     instance.query('CREATE ROLE R1')
@@ -141,7 +108,6 @@ def test_introspection():
     instance.query('GRANT CREATE ON *.* TO B WITH GRANT OPTION')
     instance.query('REVOKE SELECT(x) ON test.table FROM R2')
 
-    assert instance.query("SHOW USERS") == TSV([ "A", "B", "default" ])
     assert instance.query("SHOW ROLES") == TSV([ "R1", "R2" ])
     assert instance.query("SHOW GRANTS FOR A") == TSV([ "GRANT SELECT ON test.table TO A", "GRANT R1 TO A" ])
     assert instance.query("SHOW GRANTS FOR B") == TSV([ "GRANT CREATE ON *.* TO B WITH GRANT OPTION", "GRANT R2 TO B WITH ADMIN OPTION" ])
@@ -155,10 +121,6 @@ def test_introspection():
     assert instance.query("SHOW ENABLED ROLES", user='A') == TSV([[ "R1", 0, 1, 1 ]])
     assert instance.query("SHOW ENABLED ROLES", user='B') == TSV([[ "R2", 1, 1, 1 ]])
 
-    assert instance.query("SELECT name, storage, auth_type, auth_params, host_ip, host_names, host_names_regexp, host_names_like, default_roles_all, default_roles_list, default_roles_except from system.users WHERE name IN ('A', 'B') ORDER BY name") ==\
-           TSV([[ "A", "disk", "no_password", "[]", "['::/0']", "[]", "[]", "[]", 1, "[]", "[]" ],
-                [ "B", "disk", "no_password", "[]", "['::/0']", "[]", "[]", "[]", 1, "[]", "[]" ]])
-    
     assert instance.query("SELECT name, storage from system.roles WHERE name IN ('R1', 'R2') ORDER BY name") ==\
            TSV([[ "R1", "disk" ],
                 [ "R2", "disk" ]])