Parametrized the tests with env var

ClearcodeHQ · Mar 17, 2021 · fabdd17 · fabdd17
1 parent ff39586
commit fabdd17
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 38 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [3.7, 3.8, 3.9, pypy3]
-        postgres-version: [9.5, 9.6, 10, 11, 12, 12]
+        postgres-version: [9.5, 9.6, 10, 11, 12, 13]
     env:
       OS: ubuntu-latest
       PYTHON: ${{ matrix.python-version }}

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -5,6 +5,7 @@
 from pytest_postgresql import factories
 
 pytest_plugins = ['pytester']
+POSTGRESQL_VERSION = os.environ.get("POSTGRES", "13")
 
 
 def find_pg_ctl(path: str) -> Path:
@@ -33,15 +34,10 @@ def create_version(ver: str) -> Path:
 TEST_SQL_DIR = os.path.dirname(os.path.abspath(__file__)) + '/test_sql/'
 
 # pylint:disable=invalid-name
-postgresql95 = factories.postgresql_proc(create_version(ver='9.5'), port=None)
-postgresql96 = factories.postgresql_proc(create_version(ver='9.6'), port=None)
-postgresql10 = factories.postgresql_proc(create_version(ver='10'), port=None)
-postgresql11 = factories.postgresql_proc(create_version(ver='11'), port=None)
-postgresql12 = factories.postgresql_proc(create_version(ver='12'), port=None)
-postgresql13 = factories.postgresql_proc(create_version(ver='13'), port=None)
+postgresql_proc_version = factories.postgresql_proc(create_version(ver=POSTGRESQL_VERSION), port=None)
+postgresql_version = factories.postgresql('postgresql_proc_version')
 
 postgresql_proc2 = factories.postgresql_proc(port=9876)
-postgres10 = factories.postgresql('postgresql10')
 postgresql2 = factories.postgresql('postgresql_proc2', db_name='test-db')
 postgresql_load_1 = factories.postgresql('postgresql_proc2', db_name='test-db',
                                          load=[TEST_SQL_DIR + 'test.sql', ])

diff --git a/tests/test_noopexecutor.py b/tests/test_noopexecutor.py
@@ -3,26 +3,19 @@
 from pytest_postgresql.factories import NoopExecutor
 
 
-def test_nooproc_version_9(postgresql_proc):
-    """Test the way postgresql version is being read for versions < 10."""
-    postgresql_nooproc = NoopExecutor(
-        postgresql_proc.host,
-        postgresql_proc.port,
-        postgresql_proc.user,
-        postgresql_proc.options
-    )
-    assert postgresql_proc.version == postgresql_nooproc.version
-
+def test_nooproc_version(postgresql_proc_version):
+    """
+    Test the way postgresql version is being read.
 
-def test_nooproc_version_post_10(postgresql11):
-    """Test the way postgresql version is being read for versions >= 10."""
+    Version behaves differently for postgresql >= 10 and differently for older ones
+    """
     postgresql_nooproc = NoopExecutor(
-        postgresql11.host,
-        postgresql11.port,
-        postgresql11.user,
-        postgresql11.options
+        postgresql_proc_version.host,
+        postgresql_proc_version.port,
+        postgresql_proc_version.user,
+        postgresql_proc_version.options
     )
-    assert postgresql11.version == postgresql_nooproc.version
+    assert postgresql_proc_version.version == postgresql_nooproc.version
 
 
 def test_nooproc_cached_version(postgresql_proc):

diff --git a/tests/test_postgresql.py b/tests/test_postgresql.py
@@ -7,18 +7,9 @@
 SELECT_Q = "SELECT * FROM test;"
 
 
-@pytest.mark.parametrize('postgres', (
-    'postgresql95',
-    'postgresql96',
-    'postgresql10',
-    'postgresql11',
-    'postgresql12',
-    'postgresql13'
-))
-def test_postgresql_proc(request, postgres):
+def test_postgresql_proc(postgresql_proc_version):
     """Test different postgresql versions."""
-    postgresql_proc = request.getfixturevalue(postgres)
-    assert postgresql_proc.running() is True
+    assert postgresql_proc_version.running() is True
 
 
 def test_main_postgres(postgresql):
@@ -67,13 +58,13 @@ def test_rand_postgres_port(postgresql_rand):
 
 @pytest.mark.parametrize('_', range(2))
 def test_postgres_terminate_connection(
-        postgres10, _):
+        postgresql_version, _):
     """
     Test that connections are terminated between tests.
 
     And check that only one exists at a time.
     """
-    cur = postgres10.cursor()
+    cur = postgresql_version.cursor()
     cur.execute(
         'SELECT * FROM pg_stat_activity '
         'WHERE backend_type = \'client backend\';'