update tests for ymake plugins

7 files changed, 20 insertions, 28 deletions

diff --git a/build/plugins/tests/fake_ymake.py b/build/plugins/tests/fake_ymake/__init__.py
index a20d28525a8..a20d28525a8 100644
--- a/build/plugins/tests/fake_ymake.py
+++ b/build/plugins/tests/fake_ymake/__init__.py
diff --git a/build/plugins/tests/fake_ymake/ya.make b/build/plugins/tests/fake_ymake/ya.make
new file mode 100644
index 00000000000..16de1baaac7
--- /dev/null
+++ b/build/plugins/tests/fake_ymake/ya.make
@@ -0,0 +1,9 @@
+OWNER(g:ymake)
+
+PY23_LIBRARY()
+
+PY_SRCS(
+    __init__.py=ymake
+)
+
+END()
diff --git a/build/plugins/tests/test_code_generator.py b/build/plugins/tests/test_code_generator.py
index 7f3267a55e6..0d1d72bb307 100644
--- a/build/plugins/tests/test_code_generator.py
+++ b/build/plugins/tests/test_code_generator.py
@@ -1,9 +1,4 @@
-import sys
-from build.plugins.tests import fake_ymake
-
-sys.modules['ymake'] = fake_ymake
-
-from build.plugins import code_generator
+import code_generator
 
 
 def test_include_parser():
diff --git a/build/plugins/tests/test_common.py b/build/plugins/tests/test_common.py
index e1780354f89..7847b8bb65e 100644
--- a/build/plugins/tests/test_common.py
+++ b/build/plugins/tests/test_common.py
@@ -1,6 +1,5 @@
 import pytest
-
-import build.plugins._common as pc
+import _common as pc
 
 
 def test_sort_by_keywords():
diff --git a/build/plugins/tests/test_requirements.py b/build/plugins/tests/test_requirements.py
index 0c41fbaad0c..45375c26ed3 100644
--- a/build/plugins/tests/test_requirements.py
+++ b/build/plugins/tests/test_requirements.py
@@ -1,7 +1,7 @@
 import pytest
 
-import build.plugins._requirements as requirements
-import build.plugins.lib.test_const as consts
+import _requirements as requirements
+import lib.test_const as consts
 
 
 class TestRequirements(object):
diff --git a/build/plugins/tests/test_ssqls.py b/build/plugins/tests/test_ssqls.py
index e5daae3a574..44a775f482d 100644
--- a/build/plugins/tests/test_ssqls.py
+++ b/build/plugins/tests/test_ssqls.py
@@ -1,11 +1,6 @@
-import sys
-from build.plugins.tests import fake_ymake
-
-sys.modules['ymake'] = fake_ymake
-
 import xml.etree.cElementTree as ET
 
-from build.plugins import ssqls
+import ssqls
 
 
 example = '''\
diff --git a/build/plugins/tests/ya.make b/build/plugins/tests/ya.make
index 0c54899cc98..c8da702380b 100644
--- a/build/plugins/tests/ya.make
+++ b/build/plugins/tests/ya.make
@@ -1,14 +1,6 @@
 PY2TEST()
 
-OWNER(g:yatool)
-
-PEERDIR(
-    build/plugins
-)
-
-PY_SRCS(
-    fake_ymake.py
-)
+OWNER(g:ymake)
 
 TEST_SRCS(
     test_code_generator.py
@@ -17,9 +9,11 @@ TEST_SRCS(
     test_ssqls.py
 )
 
-NO_CHECK_IMPORTS(
-    build.plugins.code_generator
-    build.plugins.ssqls
+PEERDIR(
+    build/plugins
+    build/plugins/lib/proxy
+    build/plugins/lib/test_const/proxy
+    build/plugins/tests/fake_ymake
 )
 
 END()