diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/conftest.py | 6 | ||||
| -rw-r--r-- | tests/qc_app/test_parse.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index 0072f26..9755a47 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -21,7 +21,7 @@ def is_port_in_use(port: int) -> bool: return sckt.connect_ex(("localhost", port)) == 0 @pytest.fixture(scope="session") -def redis_server(): +def redis_url(): "Fixture to launch a new redis instance and return appropriate URI" port = next(# pylint: disable=[stop-iteration-return] port for port in range(6379,65535) if not is_port_in_use(port)) @@ -32,11 +32,11 @@ def redis_server(): process.kill() @pytest.fixture(scope="module") -def client(redis_server): # pylint: disable=[redefined-outer-name] +def client(redis_url): # pylint: disable=[redefined-outer-name] "Fixture for test client" app = create_app(f"{os.path.abspath('.')}/tests/test_instance_dir") app.config.update({ - "REDIS_URL": redis_server + "REDIS_URL": redis_url }) yield app.test_client() diff --git a/tests/qc_app/test_parse.py b/tests/qc_app/test_parse.py index b7bf938..46b45d9 100644 --- a/tests/qc_app/test_parse.py +++ b/tests/qc_app/test_parse.py @@ -10,7 +10,7 @@ def module_uuid4(): "module patch for the `uuid.uuid4()` function" return "934c55d8-396e-4959-90e1-2698e9205758" -def test_parse_with_existing_uploaded_file(client, redis_server, monkeypatch): +def test_parse_with_existing_uploaded_file(client, redis_url, monkeypatch): """ GIVEN: 1. A flask application testing client 2. A valid file, and filetype @@ -33,14 +33,14 @@ def test_parse_with_existing_uploaded_file(client, redis_server, monkeypatch): assert b'Redirecting...' in resp.data assert b'/parse/status/934c55d8-396e-4959-90e1-2698e9205758' in resp.data - with redis.Redis.from_url(redis_server, decode_responses=True) as rconn: + with redis.Redis.from_url(redis_url, decode_responses=True) as rconn: the_job = job(rconn, module_uuid4()) assert the_job["job_id"] == module_uuid4() assert the_job["filename"] == filename assert the_job["command"] == " ".join([ "python3", "-m", "scripts.worker", filetype, - f"{client.application.config['UPLOAD_FOLDER']}/{filename}", redis_server, + f"{client.application.config['UPLOAD_FOLDER']}/{filename}", redis_url, module_uuid4()]) @pytest.mark.parametrize( |