From 215cfaafb4fc4cf49569c2d9fcde6a52ec3e6a64 Mon Sep 17 00:00:00 2001 From: Alek5andr-Kotov Date: Wed, 14 Aug 2024 15:45:09 +0300 Subject: [PATCH] environment variable `YDB_TOKEN` in `ydb-cli` tests (#7781) --- ydb/apps/ydb/ut/run_ydb.cpp | 2 ++ .../ydb/ut/workload-transfer-topic-to-table.cpp | 14 +------------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/ydb/apps/ydb/ut/run_ydb.cpp b/ydb/apps/ydb/ut/run_ydb.cpp index 0dee5b6c4a02..ac9808ce9768 100644 --- a/ydb/apps/ydb/ut/run_ydb.cpp +++ b/ydb/apps/ydb/ut/run_ydb.cpp @@ -23,6 +23,8 @@ TString GetYdbDatabase() TString RunYdb(const TList& args1, const TList& args2, bool checkExitCode) { + SetEnv("YDB_TOKEN", "root@builin"); + TShellCommand command(BinaryPath(GetEnv("YDB_CLI_BINARY"))); command << "-e" << ("grpc://" + GetYdbEndpoint()); diff --git a/ydb/apps/ydb/ut/workload-transfer-topic-to-table.cpp b/ydb/apps/ydb/ut/workload-transfer-topic-to-table.cpp index 7d7ed6584a1b..718e06b12b57 100644 --- a/ydb/apps/ydb/ut/workload-transfer-topic-to-table.cpp +++ b/ydb/apps/ydb/ut/workload-transfer-topic-to-table.cpp @@ -81,7 +81,7 @@ TString ExecYdb(const TList& args, bool checkExitCode = true) // // ydb -e grpc://${YDB_ENDPOINT} -d /${YDB_DATABASE} workload transfer topic-to-table ${args} // - return RunYdb({"--user", "root", "--no-password", "workload", "transfer", "topic-to-table"}, args, + return RunYdb({"workload", "transfer", "topic-to-table"}, args, checkExitCode); } @@ -96,8 +96,6 @@ void RunYdb(const TList& args, Y_UNIT_TEST(Default_Run) { - RunYdb({"-v", "yql", "-s", R"(ALTER USER root PASSWORD "")"}, TList()); - ExecYdb({"init"}); auto output = ExecYdb({"run", "-s", "10"}); ExecYdb({"clean"}); @@ -110,8 +108,6 @@ Y_UNIT_TEST(Default_Run) Y_UNIT_TEST(Default_Init_Clean) { - RunYdb({"-v", "yql", "-s", R"(ALTER USER root PASSWORD "")"}, TList()); - const TString topic = "transfer-topic"; const TString table = "transfer-table"; @@ -121,8 +117,6 @@ Y_UNIT_TEST(Default_Init_Clean) Y_UNIT_TEST(Specific_Init_Clean) { - RunYdb({"-v", "yql", "-s", R"(ALTER USER root PASSWORD "")"}, TList()); - const TString topic = "my-topic"; const TString table = "my-table"; @@ -140,15 +134,11 @@ Y_UNIT_TEST(Specific_Init_Clean) Y_UNIT_TEST(Clean_Without_Init) { - RunYdb({"-v", "yql", "-s", R"(ALTER USER root PASSWORD "")"}, TList()); - UNIT_ASSERT_EXCEPTION(ExecYdb({"clean"}), yexception); } Y_UNIT_TEST(Double_Init) { - RunYdb({"-v", "yql", "-s", R"(ALTER USER root PASSWORD "")"}, TList()); - ExecYdb({"init"}); UNIT_ASSERT_EXCEPTION(ExecYdb({"init"}), yexception); ExecYdb({"clean"}); @@ -172,8 +162,6 @@ void EnsureStatisticsColumns(const TList& args, Y_UNIT_TEST(Statistics) { - RunYdb({"-v", "yql", "-s", R"(ALTER USER root PASSWORD "")"}, TList()); - EnsureStatisticsColumns({"run", "-s", "1", "--warmup", "0"}, {"Window", "Write speed", "Write time", "Inflight", "Read speed", "Topic time", "Select time", "Upsert time", "Commit time"}, {"#", "msg/s", "MB/s", "percentile,ms", "percentile,msg", "msg/s", "MB/s", "percentile,ms", "percentile,ms", "percentile,ms", "percentile,ms"});