Set reset_comms() in pytest autouse fixture

Author: bitterpanda63

aikido_zen/sinks/tests/clickhouse_driver_test.py

@@ -6,7 +6,8 @@
 
 
 @pytest.fixture(autouse=True)
-def set_blocking_to_true(monkeypatch):
+def setup(monkeypatch):
+    reset_comms()
     monkeypatch.setenv("AIKIDO_BLOCK", "1")
 
 
@@ -20,22 +21,19 @@ def client():
 
 
 def test_client_execute_without_context(client):
-    reset_comms()
     dog_name = "Steve"
     sql = "INSERT INTO dogs (dog_name, isAdmin) VALUES ('{}' , 0)".format(dog_name)
     client.execute(sql)
 
 
 def test_client_execute_safe(client):
-    reset_comms()
     dog_name = "Steve"
     sql = "INSERT INTO dogs (dog_name, isAdmin) VALUES ('{}' , 0)".format(dog_name)
     test_utils.generate_and_set_context(value=dog_name)
     client.execute(sql)
 
 
 def test_client_execute_unsafe(client, monkeypatch):
-    reset_comms()
     dog_name = "Malicious dog', 1); -- "
     sql = "INSERT INTO dogs (dog_name, isAdmin) VALUES ('{}' , 0)".format(dog_name)
     test_utils.generate_and_set_context(value=dog_name)
@@ -51,7 +49,6 @@ def test_cursor_execute_safe():
     from clickhouse_driver import connect
 
     conn = connect("clickhouse://localhost:9000")
-    reset_comms()
     dog_name = "Steve"
     sql = "INSERT INTO dogs (dog_name, isAdmin) VALUES ('{}' , 0)".format(dog_name)
     test_utils.generate_and_set_context(value=dog_name)
@@ -62,7 +59,6 @@ def test_cursor_execute_unsafe(monkeypatch):
     from clickhouse_driver import connect
 
     conn = connect("clickhouse://localhost:9000")
-    reset_comms()
     dog_name = "Malicious dog', 1); -- "
     sql = "INSERT INTO dogs (dog_name, isAdmin) VALUES ('{}' , 0)".format(dog_name)
     test_utils.generate_and_set_context(value=dog_name)
@@ -75,15 +71,13 @@ def test_cursor_execute_unsafe(monkeypatch):
 
 
 def test_client_execute_with_progress_safe(client):
-    reset_comms()
     dog_name = "Steve"
     sql = "INSERT INTO dogs (dog_name, isAdmin) VALUES ('{}' , 0)".format(dog_name)
     test_utils.generate_and_set_context(value=dog_name)
     client.execute_with_progress(sql)
 
 
 def test_client_execute_with_progress_unsafe(client, monkeypatch):
-    reset_comms()
     dog_name = "Malicious dog', 1); -- "
     sql = "INSERT INTO dogs (dog_name, isAdmin) VALUES ('{}' , 0)".format(dog_name)
     test_utils.generate_and_set_context(value=dog_name)
@@ -96,15 +90,13 @@ def test_client_execute_with_progress_unsafe(client, monkeypatch):
 
 
 def test_client_execute_iter_safe(client):
-    reset_comms()
     dog_name = "Steve"
     sql = "INSERT INTO dogs (dog_name, isAdmin) VALUES ('{}' , 0)".format(dog_name)
     test_utils.generate_and_set_context(value=dog_name)
     client.execute_iter(sql)
 
 
 def test_client_execute_iter_unsafe(client, monkeypatch):
-    reset_comms()
     dog_name = "Malicious dog', 1); -- "
     sql = "INSERT INTO dogs (dog_name, isAdmin) VALUES ('{}' , 0)".format(dog_name)
     test_utils.generate_and_set_context(value=dog_name)