Skip to content

Commit ac77a14

Browse files
committed
cosmetic change + try to skipping test_dry_run_catchup_ptrack in travis runs
1 parent cb46fd1 commit ac77a14

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ env:
3636
- PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
3737
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=archive
3838
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup
39+
- PG_VERSION=13 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE MODE=catchup
3940
- PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup
41+
- PG_VERSION=13 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE MODE=catchup
42+
- PG_VERSION=13 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_11_STABLE MODE=catchup
43+
- PG_VERSION=13 PG_BRANCH=REL_10_STABLE PTRACK_PATCH_PG_BRANCH=REL_10_STABLE MODE=catchup
4044
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=compression
4145
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=delta
4246
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=locking

src/catchup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* catchup.c: sync DB cluster
44
*
5-
* Copyright (c) 2021, Postgres Professional
5+
* Copyright (c) 2022, Postgres Professional
66
*
77
*-------------------------------------------------------------------------
88
*/

tests/catchup.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1456,6 +1456,9 @@ def test_config_exclusion(self):
14561456
#self.assertEqual(1, 0, 'Stop test')
14571457
self.del_test_dir(module_name, self.fname)
14581458

1459+
#########################################
1460+
# --dry-run
1461+
#########################################
14591462
def test_dry_run_catchup_full(self):
14601463
"""
14611464
Test dry-run option for full catchup
@@ -1485,7 +1488,7 @@ def test_dry_run_catchup_full(self):
14851488
options = ['-d', 'postgres', '-p', str(src_pg.port), '--stream', '--dry-run']
14861489
)
14871490

1488-
# compare data dirs before and after cathup
1491+
# compare data dirs before and after catchup
14891492
self.compare_pgdata(
14901493
content_before,
14911494
self.pgdata_content(dst_pg.data_dir)

travis/run_tests.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,20 @@ source pyenv/bin/activate
100100
pip3 install testgres
101101

102102
echo "############### Testing:"
103+
echo PG_PROBACKUP_PARANOIA=${PG_PROBACKUP_PARANOIA}
104+
echo ARCHIVE_COMPRESSION=${ARCHIVE_COMPRESSION}
105+
echo PGPROBACKUPBIN_OLD=${PGPROBACKUPBIN_OLD}
106+
echo PGPROBACKUPBIN=${PGPROBACKUPBIN}
107+
echo PGPROBACKUP_SSH_REMOTE=${PGPROBACKUP_SSH_REMOTE}
108+
echo PGPROBACKUP_GDB=${PGPROBACKUP_GDB}
109+
echo PG_PROBACKUP_PTRACK=${PG_PROBACKUP_PTRACK}
103110
if [ "$MODE" = "basic" ]; then
104111
export PG_PROBACKUP_TEST_BASIC=ON
112+
echo PG_PROBACKUP_TEST_BASIC=${PG_PROBACKUP_TEST_BASIC}
105113
python3 -m unittest -v tests
106114
python3 -m unittest -v tests.init
107115
else
116+
echo PG_PROBACKUP_TEST_BASIC=${PG_PROBACKUP_TEST_BASIC}
108117
python3 -m unittest -v tests.$MODE
109118
fi
110119

0 commit comments

Comments
 (0)