Merge dcefe94 into 9174c10

release-engineering · Mar 13, 2019 · 0a38139 · 0a38139
2 parents 9174c10 + dcefe94
commit 0a38139
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/tests/integration/authorization/authorization_test.py b/tests/integration/authorization/authorization_test.py
@@ -3,18 +3,16 @@
 # see the LICENSE file for license
 #
 
-import os
+
 import shutil
 import pytest
 import requests
 from tests.integration.utils import OMPS
 
 
 @pytest.fixture(scope='module')
-def no_auth_omps():
-    api_url = os.getenv('OMPS_INT_TEST_OMPS_URL')
-
-    return OMPS(api_url)
+def no_auth_omps(test_env):
+    return OMPS(test_env['omps_url'])
 
 
 def test_upload_without_authorization(test_env, no_auth_omps, tmp_path):

diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -12,7 +12,7 @@
 def test_env():
     """Test environment configuration.
     """
-    with open('test.env') as f:
+    with open('test.env.yaml') as f:
         env = yaml.safe_load(f)
     return env