Try fix tests #2

Author: bakwc

mysql_ch_replicator/binlog_replicator.py

@@ -340,7 +340,7 @@ class BinlogReplicator:
     SAVE_UPDATE_INTERVAL = 60
     BINLOG_CLEAN_INTERVAL = 5 * 60
     BINLOG_RETENTION_PERIOD = 12 * 60 * 60
-    READ_LOG_INTERVAL = 1
+    READ_LOG_INTERVAL = 0.3
 
     def __init__(self, settings: Settings):
         self.settings = settings

mysql_ch_replicator/db_replicator.py

@@ -103,7 +103,7 @@ class DbReplicator:
     DATA_DUMP_INTERVAL = 1
     DATA_DUMP_BATCH_SIZE = 100000
 
-    READ_LOG_INTERVAL = 1
+    READ_LOG_INTERVAL = 0.3
 
     def __init__(self, config: Settings, database: str, target_database: str = None, initial_only: bool = False):
         self.config = config

test_mysql_ch_replicator.py

@@ -207,6 +207,8 @@ def test_e2e_regular(config_file):
     mysql.execute(f'DROP TABLE {TEST_TABLE_NAME_3}')
     assert_wait(lambda: TEST_TABLE_NAME_3 not in ch.get_tables())
 
+    db_replicator_runner.stop()
+
 
 def test_e2e_multistatement():
     cfg = config.Settings()
@@ -272,6 +274,9 @@ def test_e2e_multistatement():
 
     assert_wait(lambda: TEST_TABLE_NAME_2 in ch.get_tables())
 
+    db_replicator_runner.stop()
+    binlog_replicator_runner.stop()
+
 
 def get_binlog_replicator_pid(cfg: config.Settings):
     path = os.path.join(
@@ -516,11 +521,15 @@ def test_initial_only():
 
     ch.execute_command(f'DROP DATABASE {TEST_DB_NAME}')
 
+    db_replicator_runner.stop()
+
     db_replicator_runner = DbReplicatorRunner(TEST_DB_NAME, additional_arguments='--initial_only=True')
     db_replicator_runner.run()
     db_replicator_runner.wait_complete()
     assert TEST_DB_NAME in ch.get_databases()
 
+    db_replicator_runner.stop()
+
 
 def test_database_tables_filtering():
     cfg = config.Settings()
@@ -677,6 +686,9 @@ def test_datetime_exception():
     assert_wait(lambda: str(ch.select(TEST_TABLE_NAME, where="name='Alex'")[0]['test_date']) == '2015-06-02')
     assert_wait(lambda: str(ch.select(TEST_TABLE_NAME, where="name='Ivan'")[0]['test_date']) == '2015-05-28')
 
+    db_replicator_runner.stop()
+    binlog_replicator_runner.stop()
+
 
 def test_different_types_1():
     cfg = config.Settings()
@@ -760,6 +772,8 @@ def test_different_types_1():
     )
     assert_wait(lambda: len(ch.select(TEST_TABLE_NAME)) == 3)
 
+    db_replicator_runner.stop()
+    binlog_replicator_runner.stop()
 
 def test_numeric_types_and_limits():
     cfg = config.Settings()
@@ -826,6 +840,9 @@ def test_numeric_types_and_limits():
     assert_wait(lambda: len(ch.select(TEST_TABLE_NAME, 'test6=4294967280')) == 1)
     assert_wait(lambda: len(ch.select(TEST_TABLE_NAME, 'test7=18446744073709551586')) == 2)
 
+    db_replicator_runner.stop()
+    binlog_replicator_runner.stop()
+
 
 def test_different_types_2():
     cfg = config.Settings()
@@ -892,6 +909,9 @@ def test_different_types_2():
     )
     assert_wait(lambda: len(ch.select(TEST_TABLE_NAME)) == 3)
 
+    db_replicator_runner.stop()
+    binlog_replicator_runner.stop()
+
 
 def test_json():
     cfg = config.Settings()
@@ -948,6 +968,9 @@ def test_json():
     assert json.loads(ch.select(TEST_TABLE_NAME, "name='Ivan'")[0]['data'])['c'] == [1, 2, 3]
     assert json.loads(ch.select(TEST_TABLE_NAME, "name='Peter'")[0]['data'])['c'] == [3, 2, 1]
 
+    db_replicator_runner.stop()
+    binlog_replicator_runner.stop()
+
 
 def test_string_primary_key(monkeypatch):
     monkeypatch.setattr(DbReplicator, 'INITIAL_REPLICATION_BATCH_SIZE', 1)
@@ -1007,6 +1030,9 @@ def test_string_primary_key(monkeypatch):
     )
     assert_wait(lambda: len(ch.select(TEST_TABLE_NAME)) == 3)
 
+    db_replicator_runner.stop()
+    binlog_replicator_runner.stop()
+
 
 def test_parse_mysql_table_structure():
     query = "CREATE TABLE IF NOT EXISTS user_preferences_portal (\n\t\t\tid char(36) NOT NULL,\n\t\t\tcategory varchar(50) DEFAULT NULL,\n\t\t\tdeleted tinyint(1) DEFAULT 0,\n\t\t\tdate_entered datetime DEFAULT NULL,\n\t\t\tdate_modified datetime DEFAULT NULL,\n\t\t\tassigned_user_id char(36) DEFAULT NULL,\n\t\t\tcontents longtext DEFAULT NULL\n\t\t ) ENGINE=InnoDB DEFAULT CHARSET=utf8"