update tests for ymake plugins

14 files changed, 65 insertions, 38 deletions

diff --git a/build/plugins/lib/proxy/_metric_resolvers.py b/build/plugins/lib/proxy/_metric_resolvers.py
new file mode 100644
index 0000000000..0ba5614b09
--- /dev/null
+++ b/build/plugins/lib/proxy/_metric_resolvers.py
@@ -0,0 +1 @@
+from build.plugins.lib._metric_resolvers import *  # noqa: F403, F401
diff --git a/build/plugins/lib/proxy/ya.make b/build/plugins/lib/proxy/ya.make
new file mode 100644
index 0000000000..b342c75504
--- /dev/null
+++ b/build/plugins/lib/proxy/ya.make
@@ -0,0 +1,13 @@
+OWNER(g:ymake)
+
+PY23_LIBRARY()
+
+PY_SRCS(
+    _metric_resolvers.py=lib._metric_resolvers
+)
+
+PEERDIR(
+    build/plugins/lib
+)
+
+END()
diff --git a/build/plugins/lib/test_const/proxy/__init__.py b/build/plugins/lib/test_const/proxy/__init__.py
new file mode 100644
index 0000000000..76d947734a
--- /dev/null
+++ b/build/plugins/lib/test_const/proxy/__init__.py
@@ -0,0 +1 @@
+from build.plugins.lib.test_const import *  # noqa: F403, F401
diff --git a/build/plugins/lib/test_const/proxy/ya.make b/build/plugins/lib/test_const/proxy/ya.make
new file mode 100644
index 0000000000..37d459cc00
--- /dev/null
+++ b/build/plugins/lib/test_const/proxy/ya.make
@@ -0,0 +1,13 @@
+OWNER(g:ymake)
+
+PY23_LIBRARY()
+
+PY_SRCS(
+    __init__.py=lib.test_const
+)
+
+PEERDIR(
+    build/plugins/lib/test_const
+)
+
+END()
diff --git a/build/plugins/lib/test_const/ya.make b/build/plugins/lib/test_const/ya.make
index 60f4867e46..fa5b3b184b 100644
--- a/build/plugins/lib/test_const/ya.make
+++ b/build/plugins/lib/test_const/ya.make
@@ -3,7 +3,7 @@ OWNER(g:ymake)
 PY23_LIBRARY()
 
 PY_SRCS(
-   __init__.py
+    __init__.py
 )
 
 END()
diff --git a/build/plugins/lib/ya.make b/build/plugins/lib/ya.make
index 7e61d12080..e018b2dc1d 100644
--- a/build/plugins/lib/ya.make
+++ b/build/plugins/lib/ya.make
@@ -1,7 +1,9 @@
-OWNER(g:ymake)

-

-PY23_LIBRARY()

-    PY_SRCS(

-       _metric_resolvers.py

-    )

-END()

+OWNER(g:ymake)
+
+PY23_LIBRARY()
+
+PY_SRCS(
+    _metric_resolvers.py
+)
+
+END()
diff --git a/build/plugins/tests/fake_ymake.py b/build/plugins/tests/fake_ymake/__init__.py
index a20d28525a..a20d28525a 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 0000000000..16de1baaac
--- /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 7f3267a55e..0d1d72bb30 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 e1780354f8..7847b8bb65 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 0c41fbaad0..45375c26ed 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 e5daae3a57..44a775f482 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 0c54899cc9..c8da702380 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()
diff --git a/build/plugins/ya.make b/build/plugins/ya.make
index e9ca97626d..58654720df 100644
--- a/build/plugins/ya.make
+++ b/build/plugins/ya.make
@@ -2,6 +2,8 @@ OWNER(g:ymake)
 
 PY2_LIBRARY()
 
+PY_NAMESPACE(.)
+
 PY_SRCS(
     code_generator.py
     ssqls.py
@@ -12,13 +14,16 @@ PY_SRCS(
 )
 
 PEERDIR(
-    build/plugins/lib
-    build/plugins/lib/test_const
+    build/plugins/lib/proxy
+    build/plugins/lib/test_const/proxy
 )
 
 END()
 
 RECURSE(
     tests
+    lib
+    lib/proxy
     lib/test_const
+    lib/test_const/proxy
 )