diff options
| author | gvit <gvit@ydb.tech> | 2023-01-23 01:57:28 +0300 |
|---|---|---|
| committer | gvit <gvit@ydb.tech> | 2023-01-23 01:57:28 +0300 |
| commit | 948aa31a84ddc9d1c9af38b159497c49ee11b44e (patch) | |
| tree | 3f0dbe6079131f6fa757267d1cb0a11863777a9f | |
| parent | 4d70bc2a986d293da27ade75a5340fb684f84a28 (diff) | |
| download | ydb-948aa31a84ddc9d1c9af38b159497c49ee11b44e.tar.gz | |
fix test
| -rw-r--r-- | ydb/core/cms/console/console_ut_tenants.cpp | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/ydb/core/cms/console/console_ut_tenants.cpp b/ydb/core/cms/console/console_ut_tenants.cpp index 3cd59a484c..3ff5ed9531 100644 --- a/ydb/core/cms/console/console_ut_tenants.cpp +++ b/ydb/core/cms/console/console_ut_tenants.cpp @@ -1525,26 +1525,16 @@ Y_UNIT_TEST_SUITE(TConsoleTests) { void RunTestCreateSubSubDomain(TTenantTestRuntime& runtime) { CheckCreateTenant(runtime, TENANT1_1_NAME, Ydb::StatusIds::SUCCESS, - {{"hdd", 1}, {"hdd-1", 2}}, - SLOT1_TYPE, ZONE1, 3, - SLOT2_TYPE, ZONE1, 2, - SLOT3_TYPE, ZONE1, 1); + {{"hdd", 1}, {"hdd-1", 2}}); - runtime.WaitForHiveState({{{DOMAIN1_NAME, 8, 8, 8}, - {TENANT1_1_NAME, 10, 10, 10}}}); + RestartTenantPool(runtime); CheckCreateTenant(runtime, TENANT1_1_NAME + "/sub", Ydb::StatusIds::GENERIC_ERROR, - {{"hdd", 1}}, - SLOT1_TYPE, ZONE1, 1, - SLOT2_TYPE, ZONE1, 2, - SLOT3_TYPE, ZONE1, 3); + {{"hdd", 1}}); WaitForTenantStatus(runtime, TENANT1_1_NAME + "/sub", Ydb::StatusIds::NOT_FOUND); // Check unsuccessful tenant creation doesn't break counters. CheckCounter(runtime, {}, TTenantsManager::COUNTER_TENANTS, 1); - CheckCounter(runtime, {{ {"kind", SLOT1_TYPE}, {"zone", ZONE1 } }}, TTenantsManager::COUNTER_COMPUTATIONAL_UNITS, 3); - CheckCounter(runtime, {{ {"kind", SLOT2_TYPE}, {"zone", ZONE1 } }}, TTenantsManager::COUNTER_COMPUTATIONAL_UNITS, 2); - CheckCounter(runtime, {{ {"kind", SLOT3_TYPE}, {"zone", ZONE1 } }}, TTenantsManager::COUNTER_COMPUTATIONAL_UNITS, 1); CheckCounter(runtime, {{ {"kind", "hdd"} }}, TTenantsManager::COUNTER_REQUESTED_STORAGE_UNITS, 1); CheckCounter(runtime, {{ {"kind", "hdd"} }}, TTenantsManager::COUNTER_ALLOCATED_STORAGE_UNITS, 1); CheckCounter(runtime, {{ {"kind", "hdd-1"} }}, TTenantsManager::COUNTER_REQUESTED_STORAGE_UNITS, 2); @@ -1554,15 +1544,9 @@ Y_UNIT_TEST_SUITE(TConsoleTests) { CheckRemoveTenant(runtime, TENANT1_1_NAME, Ydb::StatusIds::SUCCESS); CheckCreateTenant(runtime, TENANT1_1_NAME + "/sub", Ydb::StatusIds::SUCCESS, - {{"hdd", 2}}, - SLOT1_TYPE, ZONE1, 1, - SLOT2_TYPE, ZONE1, 2, - SLOT3_TYPE, ZONE1, 3); + {{"hdd", 2}}); CheckCounter(runtime, {}, TTenantsManager::COUNTER_TENANTS, 1); - CheckCounter(runtime, {{ {"kind", SLOT1_TYPE}, {"zone", ZONE1 } }}, TTenantsManager::COUNTER_COMPUTATIONAL_UNITS, 1); - CheckCounter(runtime, {{ {"kind", SLOT2_TYPE}, {"zone", ZONE1 } }}, TTenantsManager::COUNTER_COMPUTATIONAL_UNITS, 2); - CheckCounter(runtime, {{ {"kind", SLOT3_TYPE}, {"zone", ZONE1 } }}, TTenantsManager::COUNTER_COMPUTATIONAL_UNITS, 3); CheckCounter(runtime, {{ {"kind", "hdd"} }}, TTenantsManager::COUNTER_REQUESTED_STORAGE_UNITS, 2); CheckCounter(runtime, {{ {"kind", "hdd"} }}, TTenantsManager::COUNTER_ALLOCATED_STORAGE_UNITS, 2); CheckCounter(runtime, {{ {"kind", "hdd-1"} }}, TTenantsManager::COUNTER_REQUESTED_STORAGE_UNITS, 0); |