Merge pull request #11788 from ydb-platform/mergelibs-241120-1113

Library import 241120-1113

3 files changed, 4 insertions, 51 deletions

diff --git a/library/cpp/testing/common/env.cpp b/library/cpp/testing/common/env.cpp
index 13f3f186af..67e081c371 100644
--- a/library/cpp/testing/common/env.cpp
+++ b/library/cpp/testing/common/env.cpp
@@ -41,6 +41,10 @@ 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;
diff --git a/library/cpp/testing/mock_server/ut/server_ut.cpp b/library/cpp/testing/mock_server/ut/server_ut.cpp
deleted file mode 100644
index 74b3dcec05..0000000000
--- a/library/cpp/testing/mock_server/ut/server_ut.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <library/cpp/testing/mock_server/server.h>
-
-#include <library/cpp/http/simple/http_client.h>
-#include <library/cpp/testing/unittest/registar.h>
-
-Y_UNIT_TEST_SUITE(Server) {
-    int i;
-
-    Y_UNIT_TEST(pong) {
-        TPortManager pm;
-        ui16 port = pm.GetPort(80);
-        NMock::TMockServer server(port, []() { return new NMock::TPong; });
-
-        TKeepAliveHttpClient cl("localhost", port);
-        UNIT_ASSERT_VALUES_EQUAL(200, cl.DoGet("/ping"));
-        UNIT_ASSERT_VALUES_EQUAL(404, cl.DoGet("/kek"));
-    }
-
-    Y_UNIT_TEST(custom) {
-        class TCustomReplier: public TRequestReplier {
-        public:
-            bool DoReply(const TReplyParams& params) override {
-                THttpResponse resp(HttpCodes::HTTP_OK);
-                resp.SetContent("everithing is ok");
-                resp.OutTo(params.Output);
-
-                return true;
-            }
-        };
-
-        TPortManager pm;
-        ui16 port = pm.GetPort(80);
-        NMock::TMockServer server(port, []() { return new TCustomReplier; });
-
-        TKeepAliveHttpClient cl("localhost", port);
-        TStringStream out;
-        UNIT_ASSERT_VALUES_EQUAL(200, cl.DoGet("/foo", &out));
-        UNIT_ASSERT_VALUES_EQUAL("everithing is ok", out.Str());
-    }
-}
diff --git a/library/cpp/testing/mock_server/ut/ya.make b/library/cpp/testing/mock_server/ut/ya.make
deleted file mode 100644
index f4ee34458f..0000000000
--- a/library/cpp/testing/mock_server/ut/ya.make
+++ /dev/null
@@ -1,11 +0,0 @@
-UNITTEST_FOR(library/cpp/testing/mock_server)
-
-PEERDIR(
-    library/cpp/http/simple
-)
-
-SRCS(
-    server_ut.cpp
-)
-
-END()