From 2b2bec3679df7965af908ce3f1e8e17e39bd12fe Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Sat, 25 Sep 2021 02:04:53 +0300 Subject: [PATCH 1/3] Make some changes to Python code that I don't understand --- tests/integration/test_rocksdb_options/test.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/integration/test_rocksdb_options/test.py b/tests/integration/test_rocksdb_options/test.py index f7ed8071ca9..e8542749d8d 100644 --- a/tests/integration/test_rocksdb_options/test.py +++ b/tests/integration/test_rocksdb_options/test.py @@ -58,7 +58,7 @@ def test_valid_column_family_options(start_cluster): DROP TABLE test; """) -def test_invalid_column_family_options(): +def test_invalid_column_family_options(start_cluster): node.exec_in_container(['bash', '-c', "sed -i 's/num_levels/no_such_column_family_option/g' /etc/clickhouse-server/config.d/rocksdb.xml"]) node.restart_clickhouse() with pytest.raises(QueryRuntimeException): @@ -68,13 +68,13 @@ def test_invalid_column_family_options(): node.exec_in_container(['bash', '-c', "sed -i 's/no_such_column_family_option/num_levels/g' /etc/clickhouse-server/config.d/rocksdb.xml"]) node.restart_clickhouse() -def test_table_valid_column_family_options(): +def test_table_valid_column_family_options(start_cluster): node.query(""" CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key); DROP TABLE test; """) -def test_table_invalid_column_family_options(): +def test_table_invalid_column_family_options(start_cluster): node.exec_in_container(['bash', '-c', "sed -i 's/max_bytes_for_level_base/no_such_table_column_family_option/g' /etc/clickhouse-server/config.d/rocksdb.xml"]) node.restart_clickhouse() with pytest.raises(QueryRuntimeException): From 1881c67eff6390caf22d8186131626b539a50c61 Mon Sep 17 00:00:00 2001 From: alexey-milovidov Date: Sat, 25 Sep 2021 04:44:06 +0300 Subject: [PATCH 2/3] Remove trash --- tests/integration/test_rocksdb_options/test.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tests/integration/test_rocksdb_options/test.py b/tests/integration/test_rocksdb_options/test.py index e8542749d8d..e9e9cfdf20f 100644 --- a/tests/integration/test_rocksdb_options/test.py +++ b/tests/integration/test_rocksdb_options/test.py @@ -58,16 +58,6 @@ def test_valid_column_family_options(start_cluster): DROP TABLE test; """) -def test_invalid_column_family_options(start_cluster): - node.exec_in_container(['bash', '-c', "sed -i 's/num_levels/no_such_column_family_option/g' /etc/clickhouse-server/config.d/rocksdb.xml"]) - node.restart_clickhouse() - with pytest.raises(QueryRuntimeException): - node.query(""" - CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key); - """) - node.exec_in_container(['bash', '-c', "sed -i 's/no_such_column_family_option/num_levels/g' /etc/clickhouse-server/config.d/rocksdb.xml"]) - node.restart_clickhouse() - def test_table_valid_column_family_options(start_cluster): node.query(""" CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key); From e40a13bd1f959131eec2f9d8c138036410773059 Mon Sep 17 00:00:00 2001 From: alexey-milovidov Date: Sat, 25 Sep 2021 19:47:29 +0300 Subject: [PATCH 3/3] Remove trash --- tests/integration/test_rocksdb_options/test.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tests/integration/test_rocksdb_options/test.py b/tests/integration/test_rocksdb_options/test.py index e9e9cfdf20f..6689c232081 100644 --- a/tests/integration/test_rocksdb_options/test.py +++ b/tests/integration/test_rocksdb_options/test.py @@ -63,13 +63,3 @@ def test_table_valid_column_family_options(start_cluster): CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key); DROP TABLE test; """) - -def test_table_invalid_column_family_options(start_cluster): - node.exec_in_container(['bash', '-c', "sed -i 's/max_bytes_for_level_base/no_such_table_column_family_option/g' /etc/clickhouse-server/config.d/rocksdb.xml"]) - node.restart_clickhouse() - with pytest.raises(QueryRuntimeException): - node.query(""" - CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key); - """) - node.exec_in_container(['bash', '-c', "sed -i 's/no_such_table_column_family_option/max_bytes_for_level_base/g' /etc/clickhouse-server/config.d/rocksdb.xml"]) - node.restart_clickhouse()