diff --git a/tests/testflows/map_type/configs/clickhouse/common.xml b/tests/testflows/map_type/configs/clickhouse/common.xml deleted file mode 100644 index 567c8c05e32..00000000000 --- a/tests/testflows/map_type/configs/clickhouse/common.xml +++ /dev/null @@ -1,6 +0,0 @@ - - Europe/Moscow - :: - /var/lib/clickhouse/ - /var/lib/clickhouse/tmp/ - diff --git a/tests/testflows/map_type/configs/clickhouse/config.d/logs.xml b/tests/testflows/map_type/configs/clickhouse/config.d/logs.xml index bdf1bbc11c1..e5077af3f49 100644 --- a/tests/testflows/map_type/configs/clickhouse/config.d/logs.xml +++ b/tests/testflows/map_type/configs/clickhouse/config.d/logs.xml @@ -1,5 +1,4 @@ - 3 trace /var/log/clickhouse-server/log.log diff --git a/tests/testflows/map_type/configs/clickhouse/config.d/ports.xml b/tests/testflows/map_type/configs/clickhouse/config.d/ports.xml deleted file mode 100644 index fbc6cea74c0..00000000000 --- a/tests/testflows/map_type/configs/clickhouse/config.d/ports.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 8443 - 9440 - \ No newline at end of file diff --git a/tests/testflows/map_type/configs/clickhouse/config.d/remote.xml b/tests/testflows/map_type/configs/clickhouse/config.d/remote.xml index a7ed0d6e2b4..b7d02ceeec1 100644 --- a/tests/testflows/map_type/configs/clickhouse/config.d/remote.xml +++ b/tests/testflows/map_type/configs/clickhouse/config.d/remote.xml @@ -18,109 +18,6 @@ - - - - true - - clickhouse1 - 9440 - 1 - - - clickhouse2 - 9440 - 1 - - - clickhouse3 - 9440 - 1 - - - - - - - clickhouse1 - 9440 - 1 - - - - - - - clickhouse1 - 9000 - - - - - clickhouse2 - 9000 - - - - - - - clickhouse1 - 9000 - - - clickhouse2 - 9000 - - - - - - - clickhouse2 - 9000 - - - - - clickhouse3 - 9000 - - - - - - - clickhouse2 - 9000 - - - clickhouse3 - 9000 - - - @@ -141,71 +38,5 @@ - - - - clickhouse1 - 9000 - - - clickhouse2 - 9000 - - - clickhouse3 - 9000 - - - - - - - clickhouse1 - 9440 - 1 - - - - - clickhouse2 - 9440 - 1 - - - - - clickhouse3 - 9440 - 1 - - - - - - true - - clickhouse1 - 9440 - 1 - - user_with_a_very_very_very_very_long_name_we_will_use_him_to_simulate_the_problem_with_inserting_to_distributed_when_folder_name_is_too_long_i_hope_that_length_is_enough_username_end - - - - clickhouse2 - 9440 - 1 - user_with_a_very_very_very_very_long_name_we_will_use_him_to_simulate_the_problem_with_inserting_to_distributed_when_folder_name_is_too_long_i_hope_that_length_is_enough_username_end - - - - clickhouse3 - 9440 - 1 - user_with_a_very_very_very_very_long_name_we_will_use_him_to_simulate_the_problem_with_inserting_to_distributed_when_folder_name_is_too_long_i_hope_that_length_is_enough_username_end - - - - diff --git a/tests/testflows/map_type/configs/clickhouse/config.d/ssl.xml b/tests/testflows/map_type/configs/clickhouse/config.d/ssl.xml deleted file mode 100644 index 768d2250b79..00000000000 --- a/tests/testflows/map_type/configs/clickhouse/config.d/ssl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - /etc/clickhouse-server/ssl/server.crt - /etc/clickhouse-server/ssl/server.key - /etc/clickhouse-server/ssl/dhparam.pem - none - true - - - true - none - - AcceptCertificateHandler - - - - diff --git a/tests/testflows/map_type/configs/clickhouse/config.d/storage.xml b/tests/testflows/map_type/configs/clickhouse/config.d/storage.xml deleted file mode 100644 index 618fd6b6d24..00000000000 --- a/tests/testflows/map_type/configs/clickhouse/config.d/storage.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - 1024 - - - - - - - default - - - - - - - diff --git a/tests/testflows/map_type/configs/clickhouse/ssl/dhparam.pem b/tests/testflows/map_type/configs/clickhouse/ssl/dhparam.pem deleted file mode 100644 index 2e6cee0798d..00000000000 --- a/tests/testflows/map_type/configs/clickhouse/ssl/dhparam.pem +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN DH PARAMETERS----- -MIIBCAKCAQEAua92DDli13gJ+//ZXyGaggjIuidqB0crXfhUlsrBk9BV1hH3i7fR -XGP9rUdk2ubnB3k2ejBStL5oBrkHm9SzUFSQHqfDjLZjKoUpOEmuDc4cHvX1XTR5 -Pr1vf5cd0yEncJWG5W4zyUB8k++SUdL2qaeslSs+f491HBLDYn/h8zCgRbBvxhxb -9qeho1xcbnWeqkN6Kc9bgGozA16P9NLuuLttNnOblkH+lMBf42BSne/TWt3AlGZf -slKmmZcySUhF8aKfJnLKbkBCFqOtFRh8zBA9a7g+BT/lSANATCDPaAk1YVih2EKb -dpc3briTDbRsiqg2JKMI7+VdULY9bh3EawIBAg== ------END DH PARAMETERS----- diff --git a/tests/testflows/map_type/configs/clickhouse/ssl/server.crt b/tests/testflows/map_type/configs/clickhouse/ssl/server.crt deleted file mode 100644 index 7ade2d96273..00000000000 --- a/tests/testflows/map_type/configs/clickhouse/ssl/server.crt +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC/TCCAeWgAwIBAgIJANjx1QSR77HBMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV -BAMMCWxvY2FsaG9zdDAgFw0xODA3MzAxODE2MDhaGA8yMjkyMDUxNDE4MTYwOFow -FDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEAs9uSo6lJG8o8pw0fbVGVu0tPOljSWcVSXH9uiJBwlZLQnhN4SFSFohfI -4K8U1tBDTnxPLUo/V1K9yzoLiRDGMkwVj6+4+hE2udS2ePTQv5oaMeJ9wrs+5c9T -4pOtlq3pLAdm04ZMB1nbrEysceVudHRkQbGHzHp6VG29Fw7Ga6YpqyHQihRmEkTU -7UCYNA+Vk7aDPdMS/khweyTpXYZimaK9f0ECU3/VOeG3fH6Sp2X6FN4tUj/aFXEj -sRmU5G2TlYiSIUMF2JPdhSihfk1hJVALrHPTU38SOL+GyyBRWdNcrIwVwbpvsvPg -pryMSNxnpr0AK0dFhjwnupIv5hJIOQIDAQABo1AwTjAdBgNVHQ4EFgQUjPLb3uYC -kcamyZHK4/EV8jAP0wQwHwYDVR0jBBgwFoAUjPLb3uYCkcamyZHK4/EV8jAP0wQw -DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAM/ocuDvfPus/KpMVD51j -4IdlU8R0vmnYLQ+ygzOAo7+hUWP5j0yvq4ILWNmQX6HNvUggCgFv9bjwDFhb/5Vr -85ieWfTd9+LTjrOzTw4avdGwpX9G+6jJJSSq15tw5ElOIFb/qNA9O4dBiu8vn03C -L/zRSXrARhSqTW5w/tZkUcSTT+M5h28+Lgn9ysx4Ff5vi44LJ1NnrbJbEAIYsAAD -+UA+4MBFKx1r6hHINULev8+lCfkpwIaeS8RL+op4fr6kQPxnULw8wT8gkuc8I4+L -P9gg/xDHB44T3ADGZ5Ib6O0DJaNiToO6rnoaaxs0KkotbvDWvRoxEytSbXKoYjYp -0g== ------END CERTIFICATE----- diff --git a/tests/testflows/map_type/configs/clickhouse/ssl/server.key b/tests/testflows/map_type/configs/clickhouse/ssl/server.key deleted file mode 100644 index f0fb61ac443..00000000000 --- a/tests/testflows/map_type/configs/clickhouse/ssl/server.key +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCz25KjqUkbyjyn -DR9tUZW7S086WNJZxVJcf26IkHCVktCeE3hIVIWiF8jgrxTW0ENOfE8tSj9XUr3L -OguJEMYyTBWPr7j6ETa51LZ49NC/mhox4n3Cuz7lz1Pik62WreksB2bThkwHWdus -TKxx5W50dGRBsYfMenpUbb0XDsZrpimrIdCKFGYSRNTtQJg0D5WTtoM90xL+SHB7 -JOldhmKZor1/QQJTf9U54bd8fpKnZfoU3i1SP9oVcSOxGZTkbZOViJIhQwXYk92F -KKF+TWElUAusc9NTfxI4v4bLIFFZ01ysjBXBum+y8+CmvIxI3GemvQArR0WGPCe6 -ki/mEkg5AgMBAAECggEATrbIBIxwDJOD2/BoUqWkDCY3dGevF8697vFuZKIiQ7PP -TX9j4vPq0DfsmDjHvAPFkTHiTQXzlroFik3LAp+uvhCCVzImmHq0IrwvZ9xtB43f -7Pkc5P6h1l3Ybo8HJ6zRIY3TuLtLxuPSuiOMTQSGRL0zq3SQ5DKuGwkz+kVjHXUN -MR2TECFwMHKQ5VLrC+7PMpsJYyOMlDAWhRfUalxC55xOXTpaN8TxNnwQ8K2ISVY5 -212Jz/a4hn4LdwxSz3Tiu95PN072K87HLWx3EdT6vW4Ge5P/A3y+smIuNAlanMnu -plHBRtpATLiTxZt/n6npyrfQVbYjSH7KWhB8hBHtaQKBgQDh9Cq1c/KtqDtE0Ccr -/r9tZNTUwBE6VP+3OJeKdEdtsfuxjOCkS1oAjgBJiSDOiWPh1DdoDeVZjPKq6pIu -Mq12OE3Doa8znfCXGbkSzEKOb2unKZMJxzrz99kXt40W5DtrqKPNb24CNqTiY8Aa -CjtcX+3weat82VRXvph6U8ltMwKBgQDLxjiQQzNoY7qvg7CwJCjf9qq8jmLK766g -1FHXopqS+dTxDLM8eJSRrpmxGWJvNeNc1uPhsKsKgotqAMdBUQTf7rSTbt4MyoH5 -bUcRLtr+0QTK9hDWMOOvleqNXha68vATkohWYfCueNsC60qD44o8RZAS6UNy3ENq -cM1cxqe84wKBgQDKkHutWnooJtajlTxY27O/nZKT/HA1bDgniMuKaz4R4Gr1PIez -on3YW3V0d0P7BP6PWRIm7bY79vkiMtLEKdiKUGWeyZdo3eHvhDb/3DCawtau8L2K -GZsHVp2//mS1Lfz7Qh8/L/NedqCQ+L4iWiPnZ3THjjwn3CoZ05ucpvrAMwKBgB54 -nay039MUVq44Owub3KDg+dcIU62U+cAC/9oG7qZbxYPmKkc4oL7IJSNecGHA5SbU -2268RFdl/gLz6tfRjbEOuOHzCjFPdvAdbysanpTMHLNc6FefJ+zxtgk9sJh0C4Jh -vxFrw9nTKKzfEl12gQ1SOaEaUIO0fEBGbe8ZpauRAoGAMAlGV+2/K4ebvAJKOVTa -dKAzQ+TD2SJmeR1HZmKDYddNqwtZlzg3v4ZhCk4eaUmGeC1Bdh8MDuB3QQvXz4Dr -vOIP4UVaOr+uM+7TgAgVnP4/K6IeJGzUDhX93pmpWhODfdu/oojEKVcpCojmEmS1 -KCBtmIrQLqzMpnBpLNuSY+Q= ------END PRIVATE KEY----- diff --git a/tests/testflows/map_type/docker-compose/clickhouse-service.yml b/tests/testflows/map_type/docker-compose/clickhouse-service.yml index 2d79443dcbb..fdd4a8057a9 100755 --- a/tests/testflows/map_type/docker-compose/clickhouse-service.yml +++ b/tests/testflows/map_type/docker-compose/clickhouse-service.yml @@ -10,7 +10,6 @@ services: volumes: - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d:/etc/clickhouse-server/config.d" - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.d:/etc/clickhouse-server/users.d" - - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/ssl:/etc/clickhouse-server/ssl" - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml" - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml" - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse" diff --git a/tests/testflows/map_type/regression.py b/tests/testflows/map_type/regression.py index 78b0ac74b15..df529d7c07b 100755 --- a/tests/testflows/map_type/regression.py +++ b/tests/testflows/map_type/regression.py @@ -7,7 +7,7 @@ append_path(sys.path, "..") from helpers.cluster import Cluster from helpers.argparser import argparser -from map_type.requirements import QA_SRS018_ClickHouse_Map_Data_Type +from map_type.requirements import SRS018_ClickHouse_Map_Data_Type xfails = { "tests/table map with key integer/Int:": @@ -39,7 +39,7 @@ xflags = { @XFlags(xflags) @Name("map type") @Specifications( - QA_SRS018_ClickHouse_Map_Data_Type + SRS018_ClickHouse_Map_Data_Type ) def regression(self, local, clickhouse_binary_path, stress=None, parallel=None): """Map type regression. diff --git a/tests/testflows/map_type/requirements/requirements.py b/tests/testflows/map_type/requirements/requirements.py index 6042512abd0..e923f9ed85b 100644 --- a/tests/testflows/map_type/requirements/requirements.py +++ b/tests/testflows/map_type/requirements/requirements.py @@ -1,6 +1,6 @@ # These requirements were auto generated # from software requirements specification (SRS) -# document by TestFlows v1.6.210214.1233241. +# document by TestFlows v1.6.210223.1172503. # Do not edit by hand but re-generate instead # using 'tfs requirements generate' command. from testflows.core import Specification diff --git a/tests/testflows/regression.py b/tests/testflows/regression.py index 0e9a821cae0..b111fa241d0 100755 --- a/tests/testflows/regression.py +++ b/tests/testflows/regression.py @@ -18,6 +18,7 @@ def regression(self, local, clickhouse_binary_path, stress=None, parallel=None): Feature(test=load("ldap.regression", "regression"))(**args) Feature(test=load("rbac.regression", "regression"))(**args) Feature(test=load("aes_encryption.regression", "regression"))(**args) + Feature(test=load("map_type.regression", "regression"))(**args) if main(): regression()