Fixes unit tests

citusdata · Jul 19, 2023 · ca3bfad · ca3bfad
1 parent 2cf8d4e
commit ca3bfad
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/packaging_automation/tests/files/get_postgres_versions_tests/postgres-matrix.yml b/packaging_automation/tests/files/get_postgres_versions_tests/postgres-matrix.yml
@@ -10,12 +10,13 @@ version_matrix:
       postgres_versions: [11, 12]
   - 9.5:
       postgres_versions: [11, 12, 13]
-  # If 10.0 is released, since it is between 10.1 and 9.5, 9.5 support will be effective for 10.0.x releases
   - 10.1:
       postgres_versions: [12, 13]
   - 10.2:
       postgres_versions: [12, 13, 14]
-  - 11:
-      postgres_versions: [13, 14, 15]
+  - 11.0:
+      postgres_versions: [13, 14]
+  - 11.1:
+      postgres_versions: [ 13, 14, 15 ]
   - 12.0:
-      postgres_versions: [14, 15]
+        postgres_versions: [ 14, 15 ]
diff --git a/packaging_automation/tests/test_citus_package.py b/packaging_automation/tests/test_citus_package.py
@@ -159,26 +159,29 @@ def test_get_postgres_versions_ol_7():
         input_files_dir=f"{os.getcwd()}/packaging_automation/tests/files/get_postgres_versions_tests",
         platform="ol/7",
     )
+     # pg 15 is excluded for all releases with pg_exclude file
     assert len(release_versions) == 2 and release_versions == ["13", "14"]
-    assert len(nightly_versions) == 2 and nightly_versions == ["14", "15"]
+    assert len(nightly_versions) == 2 and nightly_versions == ["13", "14"]
 
 
 def test_get_postgres_versions_el_7():
     release_versions, nightly_versions = get_postgres_versions(
         input_files_dir=f"{os.getcwd()}/packaging_automation/tests/files/get_postgres_versions_tests",
         platform="el/7",
     )
+    # pg 15 is excluded for all releases with pg_exclude file
     assert len(release_versions) == 2 and release_versions == ["13", "14"]
-    assert len(nightly_versions) == 2 and nightly_versions == ["14", "15"]
+    assert len(nightly_versions) == 2 and nightly_versions == ["13", "14"]
 
 
 def test_get_postgres_versions_debain_bullseye():
     release_versions, nightly_versions = get_postgres_versions(
         input_files_dir=f"{os.getcwd()}/packaging_automation/tests/files/get_postgres_versions_tests",
         platform="debian/bullseye",
     )
+     # pg 15 is excluded for all releases with pg_exclude file
     assert len(release_versions) == 2 and release_versions == ["13", "14"]
-    assert len(nightly_versions) == 2 and nightly_versions == ["14", "15"]
+    assert len(nightly_versions) == 2 and nightly_versions == ["13", "14"]
 
 
 def test_upload_to_package_cloud():