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

Move loading options from env code to utils

Browse Source
This commit is contained in:
bendtherules
2016-01-09 22:50:44 +05:30
parent 72fb9b3182
commit 2a4c3fe0fe
6 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_plugin/test_gui.py
+6 -1
View File
@@ -1,4 +1,5 @@
import pytest_gui_status.status_plugin.plugin as status_plugin
import pytest_gui_status.utils
from mock import patch, MagicMock
import redis
@@ -6,7 +7,7 @@ import pytest
from ..utils_test import reload_2_3
REDIS_TEST_PORT = status_plugin.REDIS_PORT + 1
REDIS_TEST_PORT = pytest_gui_status.utils.REDIS_PORT + 1
mock_htmlPy_module = MagicMock()
mock_htmlPy_module.Object = object
@@ -43,6 +44,7 @@ def redis_master(request, auto_shutdown=True):
def test_redis_fail_1(tmpdir):
# load new redis port
import pytest_gui_status.status_gui.gui_backend as gui_backend
reload_2_3(pytest_gui_status.utils)
reload_2_3(gui_backend)
reload_2_3(status_plugin)
@@ -71,6 +73,7 @@ def test_redis_fail_1(tmpdir):
def test_redis_fail_2(tmpdir, redis_master):
# load new redis port
import pytest_gui_status.status_gui.gui_backend as gui_backend
reload_2_3(pytest_gui_status.utils)
reload_2_3(gui_backend)
reload_2_3(status_plugin)
@@ -102,6 +105,7 @@ def test_redis_fail_2(tmpdir, redis_master):
def test_redis_fail_3(tmpdir, redis_master):
# load new redis port
import pytest_gui_status.status_gui.gui_backend as gui_backend
reload_2_3(pytest_gui_status.utils)
reload_2_3(gui_backend)
reload_2_3(status_plugin)
@@ -132,6 +136,7 @@ def test_redis_fail_3(tmpdir, redis_master):
def test_redis_fail_4(tmpdir, redis_master):
# load new redis port
import pytest_gui_status.status_gui.gui_backend as gui_backend
reload_2_3(pytest_gui_status.utils)
reload_2_3(gui_backend)
reload_2_3(status_plugin)
tests/test_plugin/test_plugin.py
+6 -2
View File
@@ -93,7 +93,11 @@ def test_env_redis_1():
'''
import pytest_gui_status.status_plugin.plugin
reload_2_3(pytest_gui_status.status_plugin.plugin)
import pytest_gui_status.utils
redis_cmd_final = pytest_gui_status.status_plugin.plugin.command_redis_server
reload_2_3(pytest_gui_status.utils)
reload_2_3(pytest_gui_status.status_plugin.plugin)
reload_2_3(status_plugin)
redis_cmd_final = status_plugin.command_redis_server
assert(redis_cmd_final == "test_redis --port 1234 --test_arg = test_val")