[k2] add rpc port to k2 server (#1303)

Author: apolyakov

tests/python/lib/k2_server.py

@@ -22,7 +22,8 @@ def __init__(self, k2_server_bin, working_dir, kphp_build_dir, options=None, aut
         self._json_log_file = None
         self._options = {"start-node": True,
                          "--host": "127.0.0.1",
-                         "--port": self.http_port,
+                         "--http_port": self.http_port,
+                         "--rpc_port": self.rpc_port,
                          "--images-dir": self._images_dir,
                          "--restart-socket": "/tmp/k2_restart_node_{}".format(hash(self._working_dir)),
                          "--linking": self._linking_file}

tests/python/tests/conftest.py

@@ -20,3 +20,20 @@ def skip_k2_unsupported_test_suite(request):
             request.cls.custom_setup = lambda: None
             request.cls.custom_teardown = lambda: None
             pytest.skip("K2 skipped test")
+
+@pytest.fixture(autouse=True)
+def skip_kphp_unsupported_test(request):
+    if search_k2_bin() is None:
+        kphp_skip_mark = request.node.get_closest_marker("kphp_skip")
+        if kphp_skip_mark:
+            pytest.skip("KPHP skipped test")
+
+
+@pytest.fixture(scope="class", autouse=True)
+def skip_kphp_unsupported_test_suite(request):
+    if search_k2_bin() is None:
+        kphp_skip_mark = request.node.get_closest_marker("kphp_skip_suite")
+        if kphp_skip_mark:
+            request.cls.custom_setup = lambda: None
+            request.cls.custom_teardown = lambda: None
+            pytest.skip("KPHP skipped test")