Merge pull request #668 from postgrespro/autotests

Ogurezzz · web-flow · commit ea4ff496d56c · 2025-11-28T13:23:26.000+03:00
Update autotests .travis.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 os: linux
 
-dist: jammy
+dist: noble
 
 language: c
 
@@ -63,17 +63,21 @@ notifications:
 
 # Default MODE is basic, i.e. all tests with PG_PROBACKUP_TEST_BASIC=ON
 env:
-    - PG_VERSION=16 PG_BRANCH=master PTRACK_PATCH_PG_BRANCH=master
+    - PG_VERSION=19 PG_BRANCH=master PTRACK_PATCH_PG_BRANCH=master
+    - PG_VERSION=18 PG_BRANCH=REL_18_STABLE PTRACK_PATCH_PG_BRANCH=REL_18_STABLE
+    - PG_VERSION=18 PG_BRANCH=REL_18_STABLE PTRACK_PATCH_PG_BRANCH=REL_18_STABLE MODE=full
+    - PG_VERSION=17 PG_BRANCH=REL_17_STABLE PTRACK_PATCH_PG_BRANCH=REL_17_STABLE
+    - PG_VERSION=16 PG_BRANCH=REL_16_STABLE PTRACK_PATCH_PG_BRANCH=REL_16_STABLE
     - PG_VERSION=15 PG_BRANCH=REL_15_STABLE PTRACK_PATCH_PG_BRANCH=REL_15_STABLE
     - PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE
     - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE
-    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE
-    - PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_11_STABLE
-    - PG_VERSION=10 PG_BRANCH=REL_10_STABLE
-    - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
-    - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
-    - PG_VERSION=15 PG_BRANCH=REL_15_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=backup_test.BackupTest.test_full_backup
-    - PG_VERSION=15 PG_BRANCH=REL_15_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=backup_test.BackupTest.test_full_backup_stream
+#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE
+#    - PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_11_STABLE
+#    - PG_VERSION=10 PG_BRANCH=REL_10_STABLE
+#    - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
+#    - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
+#    - PG_VERSION=18 PG_BRANCH=REL_18_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=backup_test.BackupTest.test_full_backup
+#    - PG_VERSION=18 PG_BRANCH=REL_18_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=backup_test.BackupTest.test_full_backup_stream
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=checkdb
@@ -92,7 +96,8 @@ env:
 jobs:
     allow_failures:
         - if: env(PG_BRANCH) = master
-        - if: env(PG_BRANCH) = REL9_5_STABLE
+        - if: env(MODE) = full
+        # - if: env(PG_BRANCH) = REL9_5_STABLE
 #       - if: env(MODE) IN (archive, backup, delta, locking, merge, replica, retention, restore)
 
 # Only run CI for master branch commits to limit our travis usage
diff --git a/tests/cfs_backup_test.py b/tests/cfs_backup_test.py
@@ -1104,7 +1104,7 @@ def test_delete_random_data_file_from_tablespace_dir(self):
 
         list_data_files = find_by_pattern(
             [self.get_tblspace_path(self.node, tblspace_name)],
-            '^.*/\d+$')
+            r'^.*/\d+$')
         self.assertTrue(
             list_data_files,
             "ERROR: Files of data not found into tablespace dir"
@@ -1166,7 +1166,7 @@ def test_broken_random_data_file_into_tablespace_dir(self):
 
         list_data_files = find_by_pattern(
             [self.get_tblspace_path(self.node, tblspace_name)],
-            '^.*/\d+$')
+            r'^.*/\d+$')
         self.assertTrue(
             list_data_files,
             "ERROR: Files of data not found into tablespace dir"
diff --git a/tests/delete_test.py b/tests/delete_test.py
@@ -486,7 +486,7 @@ def test_delete_interleaved_incremental_chains(self):
 
     # @unittest.skip("skip")
     def test_delete_multiple_descendants(self):
-        """
+        r"""
         PAGEb3
           |                 PAGEa3
         PAGEb2               /
@@ -654,7 +654,7 @@ def test_delete_multiple_descendants(self):
 
     # @unittest.skip("skip")
     def test_delete_multiple_descendants_dry_run(self):
-        """
+        r"""
                  PAGEa3
         PAGEa2    /
            \     /
diff --git a/tests/false_positive_test.py b/tests/false_positive_test.py
@@ -214,6 +214,7 @@ def test_recovery_target_lsn_backup_victim(self):
         @y.sokolov: looks like this test should pass.
         So I commented 'expectedFailure'
         """
+        self._check_gdb_flag_or_skip_test()
         backup_dir = os.path.join(self.tmp_path, self.module_name, self.fname, 'backup')
         node = self.make_simple_node(
             base_dir=os.path.join(self.module_name, self.fname, 'node'),
diff --git a/tests/incr_restore_test.py b/tests/incr_restore_test.py
@@ -2429,7 +2429,7 @@ def test_incr_restore_issue_313(self):
         """
         Check that failed incremental restore can be restarted
         """
-        self._check_gdb_flag_or_skip_test
+        self._check_gdb_flag_or_skip_test()
         node = self.make_simple_node('node',
             set_replication=True,
             initdb_params=['--data-checksums'])
diff --git a/tests/merge_test.py b/tests/merge_test.py
@@ -1950,7 +1950,7 @@ def test_merge_backup_from_future(self):
 
     # @unittest.skip("skip")
     def test_merge_multiple_descendants(self):
-        """
+        r"""
         PAGEb3
           |                 PAGEa3
         PAGEb2               /
diff --git a/tests/restore_test.py b/tests/restore_test.py
@@ -3866,7 +3866,7 @@ def test_restore_issue_313(self):
         """
         Check that partially restored PostgreSQL instance cannot be started
         """
-        self._check_gdb_flag_or_skip_test
+        self._check_gdb_flag_or_skip_test()
         node = self.make_simple_node('node',
             set_replication=True,
             initdb_params=['--data-checksums'])
diff --git a/tests/retention_test.py b/tests/retention_test.py
@@ -714,7 +714,7 @@ def test_window_merge_interleaved_incremental_chains_1(self):
 
     # @unittest.skip("skip")
     def test_basic_window_merge_multiple_descendants(self):
-        """
+        r"""
         PAGEb3
           |                 PAGEa3
         -----------------------------retention window
@@ -970,7 +970,7 @@ def test_basic_window_merge_multiple_descendants(self):
 
     # @unittest.skip("skip")
     def test_basic_window_merge_multiple_descendants_1(self):
-        """
+        r"""
         PAGEb3
           |                 PAGEa3
         -----------------------------retention window
diff --git a/travis/install.sh b/travis/install.sh
@@ -39,6 +39,11 @@ cd postgres # Go to postgres dir
 if [ "$PG_PROBACKUP_PTRACK" = "ON" ]; then
     git apply -3 contrib/ptrack/patches/${PTRACK_PATCH_PG_BRANCH}-ptrack-core.diff
 fi
+
+if [ "$PG_BRANCH" = "REL_18_STABLE" ]; then
+    git apply -3 ../patches/${PG_BRANCH}_pg_probackup.patch
+fi
+
 CC='ccache gcc' CFLAGS="-Og" ./configure --prefix=$PGHOME \
     --cache-file=~/.ccache/configure-cache \
     --enable-debug --enable-cassert --enable-depend \
@@ -63,4 +68,4 @@ if [ ! -d "contrib/amcheck" ]; then
     make -C contrib/amcheck install
 fi
 
-pip3 install testgres
+pip3 install -r ../tests/requirements.txt
diff --git a/travis/script.sh b/travis/script.sh
@@ -21,6 +21,10 @@ if [ -z ${PGPROBACKUP_GDB+x} ]; then
 	PGPROBACKUP_GDB=ON
 fi
 
+if [ -z ${PG_PROBACKUP_PTRACK+x} ]; then
+	PG_PROBACKUP_PTRACK=ON
+fi
+
 echo "############### Testing:"
 echo PG_PROBACKUP_PARANOIA=${PG_PROBACKUP_PARANOIA}
 echo ARCHIVE_COMPRESSION=${ARCHIVE_COMPRESSION}
@@ -30,12 +34,20 @@ echo PGPROBACKUP_SSH_REMOTE=${PGPROBACKUP_SSH_REMOTE}
 echo PGPROBACKUP_GDB=${PGPROBACKUP_GDB}
 echo PG_PROBACKUP_PTRACK=${PG_PROBACKUP_PTRACK}
 
+#Run Full tests only if FULL_TESTS=ON e.g. for master branch
+if [ "$MODE" = "full" ] && [ -z ${FULL_TESTS} ]; then
+    exit
+fi
+
 if [ "$MODE" = "basic" ]; then
     export PG_PROBACKUP_TEST_BASIC=ON
     echo PG_PROBACKUP_TEST_BASIC=${PG_PROBACKUP_TEST_BASIC}
-    python3 -m unittest -v tests
-    python3 -m unittest -v tests.init_test
+    python3 -m pytest -v -n4 -k "test_basic"
+    python3 -m pytest -v -n4 -k "init_test.py"
+elif [ "$MODE" = "full" ]; then
+    echo PG_PROBACKUP_TEST_BASIC=${PG_PROBACKUP_TEST_BASIC}
+    python3 -m pytest -v -n4
 else
     echo PG_PROBACKUP_TEST_BASIC=${PG_PROBACKUP_TEST_BASIC}
-    python3 -m unittest -v tests.$MODE
+    python3 -m pytest -v -n4 -k "$MODE"
 fi
