[PBCKP-220] removed FULL tests, PGPROBACKUP=ON and other flags added on CI

Author: Ivan Lazarev

.gitignore

@@ -50,7 +50,6 @@
 /docker-compose.yml
 /Dockerfile
 /Dockerfile.in
-/run_tests.sh
 /make_dockerfile.sh
 /backup_restore.sh
 

.travis.yml

@@ -34,7 +34,8 @@ env:
     - 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=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE MODE=TMP
+#    - PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE MODE=FULL ENV_FLAGS=PGPROBACKUP_GDB=ON
+    - PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE ENV_FLAGS=PGPROBACKUP_GDB=ON
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=archive
 #    - 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

tests/Readme.md

@@ -51,31 +51,19 @@ Usage:
  python -m unittest [-v] tests[.specific_module][.class.test]
 ```
 
-### Troubleshooting FAQ
+# Troubleshooting FAQ
 
-#### python test failures
-1. Test failure reason like 
+## Python tests failure
+### 1. Could not open extension "..."
 ```
-testgres.exceptions.QueryException ERROR:  could not open extension control file "/home/avaness/postgres/postgres.build/share/extension/amcheck.control": No such file or directory
+testgres.exceptions.QueryException ERROR:  could not open extension control file "<postgres_build_dir>/share/extension/amcheck.control": No such file or directory
 ```
 
-*Solution*: you have no `<postgres_src_root>/contrib/` extensions installed
+#### Solution:
 
-```commandline
-cd <postgres_src_root>
-make world install
-```
-
-2. Test failure
-
-```
-FAIL: test_help_6 (tests.option.OptionTest)
-```
-
-*Solution*: you didn't configure postgres build with `--enable-nls` 
+You have no `<postgres_src_root>/contrib/...` extension installed, please do
 
 ```commandline
 cd <postgres_src_root>
-make distclean
-<your-./configure-cmdline> --enable-nls
+make install-world
 ```

tests/checkdb.py

@@ -546,11 +546,8 @@ def test_checkdb_checkunique(self):
     # @unittest.skip("skip")
     def test_checkdb_sigint_handling(self):
         """"""
-        if not self.gdb:
-            self.skipTest(
-                "Specify PGPROBACKUP_GDB and build without "
-                "optimizations for run this test"
-            )
+        self._check_gdb_flag_or_skip_test()
+
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         node = self.make_simple_node(

tests/pgpro2068.py

@@ -20,11 +20,6 @@ def test_minrecpoint_on_replica(self):
         """
         self._check_gdb_flag_or_skip_test()
 
-        if not self.gdb:
-            self.skipTest(
-                "Specify PGPROBACKUP_GDB and build without "
-                "optimizations for run this test"
-            )
         fname = self.id().split('.')[3]
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),

tests/replica.py

@@ -539,11 +539,8 @@ def test_replica_promote(self):
         start backup from replica, during backup promote replica
         check that backup is failed
         """
-        if not self.gdb:
-            self.skipTest(
-                "Specify PGPROBACKUP_GDB and build without "
-                "optimizations for run this test"
-            )
+        self._check_gdb_flag_or_skip_test()
+
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         master = self.make_simple_node(

tests/validate.py

@@ -1089,11 +1089,8 @@ def test_validate_instance_with_several_corrupt_backups_interrupt(self):
         """
         check that interrupt during validation is handled correctly
         """
-        if not self.gdb:
-            self.skipTest(
-                "Specify PGPROBACKUP_GDB and build without "
-                "optimizations for run this test"
-            )
+        self._check_gdb_flag_or_skip_test()
+
         fname = self.id().split('.')[3]
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),

travis/run_tests.sh

@@ -107,17 +107,18 @@ echo PGPROBACKUPBIN=${PGPROBACKUPBIN}
 echo PGPROBACKUP_SSH_REMOTE=${PGPROBACKUP_SSH_REMOTE}
 echo PGPROBACKUP_GDB=${PGPROBACKUP_GDB}
 echo PG_PROBACKUP_PTRACK=${PG_PROBACKUP_PTRACK}
+echo ADDITIONAL_ENV_FLAGS=${ENV_FLAGS}
 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
-elif [ "$MODE" = "TMP" ]; then
-    echo MODE=TMP
-    PGPROBACKUP_GDB=ON python3 -m unittest -v tests
+    ${ADDITIONAL_ENV_FLAGS} python3 -m unittest -v tests
+    ${ADDITIONAL_ENV_FLAGS} python3 -m unittest -v tests.init
+#elif [ "$MODE" = "FULL" ]; then
+#    echo MODE=FULL
+#    ${ADDITIONAL_ENV_FLAGS} python3 -m unittest -v tests
 else
     echo PG_PROBACKUP_TEST_BASIC=${PG_PROBACKUP_TEST_BASIC}
-    python3 -m unittest -v tests.$MODE
+    ${ADDITIONAL_ENV_FLAGS} python3 -m unittest -v tests.$MODE
 fi
 
 # Generate *.gcov files