Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit25b2c7e

Browse files
author
Oleg Gurev
committed
Update autotests CI job
Remove WindowsServer build jobChange unittest to pytestAdd patch apply for REL_18_STABLE+
1 parent1683c74 commit25b2c7e

File tree

8 files changed

+43
-115
lines changed

8 files changed

+43
-115
lines changed

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎.travis.yml‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
os:linux
22

3-
dist:jammy
3+
dist:noble
44

55
language:c
66

@@ -63,17 +63,21 @@ notifications:
6363

6464
# Default MODE is basic, i.e. all tests with PG_PROBACKUP_TEST_BASIC=ON
6565
env:
66-
-PG_VERSION=16 PG_BRANCH=master PTRACK_PATCH_PG_BRANCH=master
66+
-PG_VERSION=19 PG_BRANCH=master PTRACK_PATCH_PG_BRANCH=master
67+
-PG_VERSION=18 PG_BRANCH=REL_18_STABLE PTRACK_PATCH_PG_BRANCH=REL_18_STABLE
68+
-PG_VERSION=18 PG_BRANCH=REL_18_STABLE PTRACK_PATCH_PG_BRANCH=REL_18_STABLE MODE=full
69+
-PG_VERSION=17 PG_BRANCH=REL_17_STABLE PTRACK_PATCH_PG_BRANCH=REL_17_STABLE
70+
-PG_VERSION=16 PG_BRANCH=REL_16_STABLE PTRACK_PATCH_PG_BRANCH=REL_16_STABLE
6771
-PG_VERSION=15 PG_BRANCH=REL_15_STABLE PTRACK_PATCH_PG_BRANCH=REL_15_STABLE
6872
-PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE
6973
-PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE
70-
-PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE
71-
-PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_11_STABLE
72-
-PG_VERSION=10 PG_BRANCH=REL_10_STABLE
73-
-PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
74-
-PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
75-
-PG_VERSION=15 PG_BRANCH=REL_15_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=backup_test.BackupTest.test_full_backup
76-
-PG_VERSION=15 PG_BRANCH=REL_15_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=backup_test.BackupTest.test_full_backup_stream
74+
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE
75+
# - PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_11_STABLE
76+
# - PG_VERSION=10 PG_BRANCH=REL_10_STABLE
77+
# - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
78+
# - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
79+
# - PG_VERSION=18 PG_BRANCH=REL_18_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=backup_test.BackupTest.test_full_backup
80+
# - PG_VERSION=18 PG_BRANCH=REL_18_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=backup_test.BackupTest.test_full_backup_stream
7781
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup
7882
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup
7983
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=checkdb
@@ -92,7 +96,8 @@ env:
9296
jobs:
9397
allow_failures:
9498
-if:env(PG_BRANCH) = master
95-
-if:env(PG_BRANCH) = REL9_5_STABLE
99+
-if:env(MODE) = full
100+
# - if: env(PG_BRANCH) = REL9_5_STABLE
96101
# - if: env(MODE) IN (archive, backup, delta, locking, merge, replica, retention, restore)
97102

98103
# Only run CI for master branch commits to limit our travis usage

‎tests/cfs_backup_test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,7 +1104,7 @@ def test_delete_random_data_file_from_tablespace_dir(self):
11041104

11051105
list_data_files=find_by_pattern(
11061106
[self.get_tblspace_path(self.node,tblspace_name)],
1107-
'^.*/\d+$')
1107+
r'^.*/\d+$')
11081108
self.assertTrue(
11091109
list_data_files,
11101110
"ERROR: Files of data not found into tablespace dir"
@@ -1166,7 +1166,7 @@ def test_broken_random_data_file_into_tablespace_dir(self):
11661166

11671167
list_data_files=find_by_pattern(
11681168
[self.get_tblspace_path(self.node,tblspace_name)],
1169-
'^.*/\d+$')
1169+
r'^.*/\d+$')
11701170
self.assertTrue(
11711171
list_data_files,
11721172
"ERROR: Files of data not found into tablespace dir"

‎tests/delete_test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ def test_delete_interleaved_incremental_chains(self):
486486

487487
# @unittest.skip("skip")
488488
deftest_delete_multiple_descendants(self):
489-
"""
489+
r"""
490490
PAGEb3
491491
| PAGEa3
492492
PAGEb2 /
@@ -654,7 +654,7 @@ def test_delete_multiple_descendants(self):
654654

655655
# @unittest.skip("skip")
656656
deftest_delete_multiple_descendants_dry_run(self):
657-
"""
657+
r"""
658658
PAGEa3
659659
PAGEa2 /
660660
\ /

‎tests/merge_test.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1950,7 +1950,7 @@ def test_merge_backup_from_future(self):
19501950

19511951
# @unittest.skip("skip")
19521952
deftest_merge_multiple_descendants(self):
1953-
"""
1953+
r"""
19541954
PAGEb3
19551955
| PAGEa3
19561956
PAGEb2 /

‎tests/retention_test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ def test_window_merge_interleaved_incremental_chains_1(self):
714714

715715
# @unittest.skip("skip")
716716
deftest_basic_window_merge_multiple_descendants(self):
717-
"""
717+
r"""
718718
PAGEb3
719719
| PAGEa3
720720
-----------------------------retention window
@@ -970,7 +970,7 @@ def test_basic_window_merge_multiple_descendants(self):
970970

971971
# @unittest.skip("skip")
972972
deftest_basic_window_merge_multiple_descendants_1(self):
973-
"""
973+
r"""
974974
PAGEb3
975975
| PAGEa3
976976
-----------------------------retention window

‎travis/install.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ cd postgres # Go to postgres dir
3939
if ["$PG_PROBACKUP_PTRACK"="ON" ];then
4040
git apply -3 contrib/ptrack/patches/${PTRACK_PATCH_PG_BRANCH}-ptrack-core.diff
4141
fi
42+
43+
if ["$PG_BRANCH"="REL_18_STABLE" ];then
44+
git apply -3 ../patches/${PG_BRANCH}_pg_probackup.patch
45+
fi
46+
4247
CC='ccache gcc' CFLAGS="-Og" ./configure --prefix=$PGHOME \
4348
--cache-file=~/.ccache/configure-cache \
4449
--enable-debug --enable-cassert --enable-depend \
@@ -63,4 +68,4 @@ if [ ! -d "contrib/amcheck" ]; then
6368
make -C contrib/amcheck install
6469
fi
6570

66-
pip3 installtestgres
71+
pip3 install-r ../tests/requirements.txt

‎travis/script.sh‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ if [ -z ${PGPROBACKUP_GDB+x} ]; then
2121
PGPROBACKUP_GDB=ON
2222
fi
2323

24+
if [-z${PG_PROBACKUP_PTRACK+x} ];then
25+
PG_PROBACKUP_PTRACK=ON
26+
fi
27+
2428
echo"############### Testing:"
2529
echo PG_PROBACKUP_PARANOIA=${PG_PROBACKUP_PARANOIA}
2630
echo ARCHIVE_COMPRESSION=${ARCHIVE_COMPRESSION}
@@ -30,12 +34,20 @@ echo PGPROBACKUP_SSH_REMOTE=${PGPROBACKUP_SSH_REMOTE}
3034
echo PGPROBACKUP_GDB=${PGPROBACKUP_GDB}
3135
echo PG_PROBACKUP_PTRACK=${PG_PROBACKUP_PTRACK}
3236

37+
#Run Full tests only if FULL_TESTS=ON e.g. for master branch
38+
if ["$MODE"="full" ]&& [-z${FULL_TESTS} ];then
39+
exit
40+
fi
41+
3342
if ["$MODE"="basic" ];then
3443
export PG_PROBACKUP_TEST_BASIC=ON
3544
echo PG_PROBACKUP_TEST_BASIC=${PG_PROBACKUP_TEST_BASIC}
36-
python3 -m unittest -v tests
37-
python3 -m unittest -v tests.init_test
45+
python3 -m pytest -v -n4 -k"test_basic"
46+
python3 -m pytest -v -n4 -k"init_test.py"
47+
elif ["$MODE"="full" ];then
48+
echo PG_PROBACKUP_TEST_BASIC=${PG_PROBACKUP_TEST_BASIC}
49+
python3 -m pytest -v -n4
3850
else
3951
echo PG_PROBACKUP_TEST_BASIC=${PG_PROBACKUP_TEST_BASIC}
40-
python3 -munittest -vtests.$MODE
52+
python3 -mpytest -v-n4 -k"$MODE"
4153
fi

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp