aboutsummaryrefslogtreecommitdiffstats
path: root/library/cpp/testing
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2024-12-12 13:15:03 +0300
committerthegeorg <thegeorg@yandex-team.com>2024-12-12 13:33:22 +0300
commit2fa0ef191a3e4958ba689ecdc0aabc756385ca13 (patch)
tree8833e1fe6be84310349bc960c852f28902bb0d0b /library/cpp/testing
parenta0ab79ee3d99df566509c5cb1e42129017424703 (diff)
downloadydb-2fa0ef191a3e4958ba689ecdc0aabc756385ca13.tar.gz
Switch all tests to atd from snapshot
commit_hash:a9a7c2df09742a540851227c4fcb7d925edd9793
Diffstat (limited to 'library/cpp/testing')
-rw-r--r--library/cpp/testing/common/env.cpp26
-rw-r--r--library/cpp/testing/common/ut/env_ut.cpp18
2 files changed, 1 insertions, 43 deletions
diff --git a/library/cpp/testing/common/env.cpp b/library/cpp/testing/common/env.cpp
index 67e081c371..1440186d78 100644
--- a/library/cpp/testing/common/env.cpp
+++ b/library/cpp/testing/common/env.cpp
@@ -41,31 +41,7 @@ TString BinaryPath(TStringBuf path) {
}
TString GetArcadiaTestsData() {
- if (GetEnv("USE_ATD_FROM_SNAPSHOT")) {
- return ArcadiaSourceRoot() + "/atd_ro_snapshot";
- }
-
- TString atdRoot = NPrivate::GetTestEnv().ArcadiaTestsDataDir;
- if (atdRoot) {
- return atdRoot;
- }
-
- TString path = NPrivate::GetCwd();
- const char pathsep = GetDirectorySeparator();
- while (!path.empty()) {
- TString dataDir = path + "/arcadia_tests_data";
- if (IsDir(dataDir)) {
- return dataDir;
- }
-
- size_t pos = path.find_last_of(pathsep);
- if (pos == TString::npos) {
- pos = 0;
- }
- path.erase(pos);
- }
-
- return {};
+ return ArcadiaSourceRoot() + "/atd_ro_snapshot";
}
TString GetWorkPath() {
diff --git a/library/cpp/testing/common/ut/env_ut.cpp b/library/cpp/testing/common/ut/env_ut.cpp
index fe4946a65f..4b67d05efb 100644
--- a/library/cpp/testing/common/ut/env_ut.cpp
+++ b/library/cpp/testing/common/ut/env_ut.cpp
@@ -45,24 +45,6 @@ TEST(Runtime, BinaryPath) {
EXPECT_TRUE(TFsPath(BinaryPath("library/cpp/testing/common/ut")).Exists());
}
-TEST(Runtime, GetArcadiaTestsData) {
- NTesting::TScopedEnvironment contextGuard("YA_TEST_CONTEXT_FILE", ""); // remove context filename
- {
- auto tmpDir = ::GetSystemTempDir();
- NTesting::TScopedEnvironment guard("ARCADIA_TESTS_DATA_DIR", tmpDir);
- Singleton<NPrivate::TTestEnv>()->ReInitialize();
- EXPECT_EQ(tmpDir, GetArcadiaTestsData());
- }
- {
- NTesting::TScopedEnvironment guard("ARCADIA_TESTS_DATA_DIR", "");
- Singleton<NPrivate::TTestEnv>()->ReInitialize();
- auto path = GetArcadiaTestsData();
- // it is not error if path is empty
- const bool ok = (path.empty() || GetBaseName(path) == "arcadia_tests_data");
- EXPECT_TRUE(ok);
- }
-}
-
TEST(Runtime, GetWorkPath) {
NTesting::TScopedEnvironment contextGuard("YA_TEST_CONTEXT_FILE", ""); // remove context filename
{