bendtherules/pytest_gui_status
1
0
Fork 0
mirror of https://github.com/bendtherules/pytest_gui_status.git synced 2026-08-18 21:52:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use env REDIS_ARGS, REDIS_PATH and port in caps

Browse Source
This commit is contained in:
bendtherules
2015-12-25 18:26:27 +05:30
parent 10f29b3872
commit dff21fce37
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pytest_gui_status/status_plugin/plugin.py
+9 -6
View File
@@ -8,17 +8,19 @@ import psutil
import datetime import datetime
env_redis_port = os.environ.get("pytest_status_port") env_redis_port = os.environ.get("PYTEST_STATUS_PORT")
if env_redis_port: if env_redis_port:
REDIS_PORT = int(env_redis_port) REDIS_PORT = int(env_redis_port)
else: else:
REDIS_PORT = 5946 REDIS_PORT = 5946
if os.environ.get("TRAVIS") == "true": REDIS_PATH = os.environ.get("REDIS_PATH") or "redis-server"
command_redis_server_gen = "redis-server --port {port}" REDIS_ARGS = os.environ.get("REDIS_ARGS") or ""
else:
command_redis_server_gen = "redis-server --port {port} --maxheap 20MB" command_redis_server_gen = "{REDIS_PATH} --port {REDIS_PORT} {REDIS_ARGS}"
command_redis_server = command_redis_server_gen.format(port=REDIS_PORT) command_redis_server = command_redis_server_gen.format(REDIS_PATH=REDIS_PATH,
REDIS_ARGS=REDIS_ARGS,
REDIS_PORT=REDIS_PORT)
command_status_gui_gen = "pytest_gui_status \"{norm_dir_name}\"" command_status_gui_gen = "pytest_gui_status \"{norm_dir_name}\""
@@ -252,6 +254,7 @@ def pytest_configure(config):
def pytest_sessionstart(session): def pytest_sessionstart(session):
config = session.config config = session.config
PYTEST_DATA.data["dir_name_start"] = str(session.startdir) PYTEST_DATA.data["dir_name_start"] = str(session.startdir)
Helpers.on_start(PYTEST_DATA.data["dir_name_start"]) Helpers.on_start(PYTEST_DATA.data["dir_name_start"])
tests/test_plugin/test_plugin.py
+4 -4
View File
@@ -39,7 +39,7 @@ def create_temp_case(case_name, path_tmpdir=None):
@patch.dict("os.environ", @patch.dict("os.environ",
{"pytest_status_port": str(REDIS_TEST_PORT)}) {"PYTEST_STATUS_PORT": str(REDIS_TEST_PORT)})
def test_whole_1(tmpdir): def test_whole_1(tmpdir):
''' '''
Integration test Integration test
@@ -49,7 +49,7 @@ def test_whole_1(tmpdir):
path_case = create_temp_case("case_1", tmpdir) path_case = create_temp_case("case_1", tmpdir)
os.chdir(path_case) os.chdir(path_case)
assert(os.environ.get("pytest_status_port") == str(REDIS_TEST_PORT)) assert(os.environ.get("PYTEST_STATUS_PORT") == str(REDIS_TEST_PORT))
popen_pytest = subprocess.Popen(["py.test", "-s"], shell=True) popen_pytest = subprocess.Popen(["py.test", "-s"], shell=True)
popen_pytest.wait() popen_pytest.wait()
@@ -68,7 +68,7 @@ def test_whole_1(tmpdir):
@patch.dict("os.environ", @patch.dict("os.environ",
{"pytest_status_port": str(REDIS_TEST_PORT)}) {"PYTEST_STATUS_PORT": str(REDIS_TEST_PORT)})
def test_whole_2(tmpdir): def test_whole_2(tmpdir):
''' '''
Integration test Integration test
@@ -93,7 +93,7 @@ def test_whole_2(tmpdir):
@patch.dict("os.environ", @patch.dict("os.environ",
{"pytest_status_port": str(REDIS_TEST_PORT)}) {"PYTEST_STATUS_PORT": str(REDIS_TEST_PORT)})
def test_intermediate_1(tmpdir): def test_intermediate_1(tmpdir):
''' '''
Integration test Integration test