Skip to content

GitLab

C
ceph
Commit 452dc412 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Do not use tox above 4.4.2 due to py3 internal failure

parent 35e71378
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 23 deletions
ceph-15.2.15-fix_tests.patch
View file @ 452dc412
diff -uNr ceph-15.2.15/src/test/cli/ceph-conf/env-vs-args.t ceph-15.2.15-fix_tests/src/test/cli/ceph-conf/env-vs-args.t diff -uNr --no-dereference ceph-15.2.15/install-deps.sh ceph-15.2.15-fix_tests/install-deps.sh
--- ceph-15.2.15/install-deps.sh 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-fix_tests/install-deps.sh 2023-02-03 23:18:14.091353261 +1030
@@ -432,7 +432,7 @@
# of pip matters when it comes to using wheel packages
PIP_OPTS="--timeout 300 --exists-action i"
pip $PIP_OPTS $install \
- 'setuptools >= 0.8' 'pip >= 7.0' 'wheel >= 0.24' 'tox >= 2.9.1' || return 1
+ 'setuptools >= 0.8' 'pip >= 7.0' 'wheel >= 0.24' 'tox >= 2.9.1, <= 4.4.2' || return 1
if test $# != 0 ; then
pip $PIP_OPTS $install $@ || return 1
fi
diff -uNr --no-dereference ceph-15.2.15/src/test/cli/ceph-conf/env-vs-args.t ceph-15.2.15-fix_tests/src/test/cli/ceph-conf/env-vs-args.t
--- ceph-15.2.15/src/test/cli/ceph-conf/env-vs-args.t 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/test/cli/ceph-conf/env-vs-args.t 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-fix_tests/src/test/cli/ceph-conf/env-vs-args.t 2022-02-07 00:15:45.649300945 +1030 +++ ceph-15.2.15-fix_tests/src/test/cli/ceph-conf/env-vs-args.t 2023-02-03 23:15:37.499879540 +1030
@@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
$ env CEPH_CONF=from-env ceph-conf -s foo bar $ env CEPH_CONF=from-env ceph-conf -s foo bar
did not load config file, using default settings. did not load config file, using default settings.
...@@ -13,9 +25,9 @@ diff -uNr ceph-15.2.15/src/test/cli/ceph-conf/env-vs-args.t ceph-15.2.15-fix_tes ...@@ -13,9 +25,9 @@ diff -uNr ceph-15.2.15/src/test/cli/ceph-conf/env-vs-args.t ceph-15.2.15-fix_tes
[1] [1]
# command-line arguments should override environment # command-line arguments should override environment
diff -uNr ceph-15.2.15/src/test/CMakeLists.txt ceph-15.2.15-fix_tests/src/test/CMakeLists.txt diff -uNr --no-dereference ceph-15.2.15/src/test/CMakeLists.txt ceph-15.2.15-fix_tests/src/test/CMakeLists.txt
--- ceph-15.2.15/src/test/CMakeLists.txt 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/test/CMakeLists.txt 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-fix_tests/src/test/CMakeLists.txt 2022-02-07 00:15:45.650300949 +1030 +++ ceph-15.2.15-fix_tests/src/test/CMakeLists.txt 2023-02-03 23:15:37.499879540 +1030
@@ -512,11 +512,17 @@ @@ -512,11 +512,17 @@
# Run rbd-unit-tests separate so they an run in parallel # Run rbd-unit-tests separate so they an run in parallel
# For values see: src/include/rbd/features.h # For values see: src/include/rbd/features.h
...@@ -42,9 +54,9 @@ diff -uNr ceph-15.2.15/src/test/CMakeLists.txt ceph-15.2.15-fix_tests/src/test/C ...@@ -42,9 +54,9 @@ diff -uNr ceph-15.2.15/src/test/CMakeLists.txt ceph-15.2.15-fix_tests/src/test/C
find_program(PROMTOOL_EXECUTABLE promtool) find_program(PROMTOOL_EXECUTABLE promtool)
if(PROMTOOL_EXECUTABLE) if(PROMTOOL_EXECUTABLE)
diff -uNr ceph-15.2.15/src/test/common/Throttle.cc ceph-15.2.15-fix_tests/src/test/common/Throttle.cc diff -uNr --no-dereference ceph-15.2.15/src/test/common/Throttle.cc ceph-15.2.15-fix_tests/src/test/common/Throttle.cc
--- ceph-15.2.15/src/test/common/Throttle.cc 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/test/common/Throttle.cc 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-fix_tests/src/test/common/Throttle.cc 2022-02-07 00:15:45.650300949 +1030 +++ ceph-15.2.15-fix_tests/src/test/common/Throttle.cc 2023-02-03 23:15:37.500879543 +1030
@@ -332,7 +332,7 @@ @@ -332,7 +332,7 @@
3, 3,
6); 6);
...@@ -54,18 +66,18 @@ diff -uNr ceph-15.2.15/src/test/common/Throttle.cc ceph-15.2.15-fix_tests/src/te ...@@ -54,18 +66,18 @@ diff -uNr ceph-15.2.15/src/test/common/Throttle.cc ceph-15.2.15-fix_tests/src/te
ASSERT_LT(results.second.count(), 0.0002); ASSERT_LT(results.second.count(), 0.0002);
ASSERT_GT(results.second.count(), 0.00005); ASSERT_GT(results.second.count(), 0.00005);
} }
diff -uNr ceph-15.2.15/src/test/encoding/CMakeLists.txt ceph-15.2.15-fix_tests/src/test/encoding/CMakeLists.txt diff -uNr --no-dereference ceph-15.2.15/src/test/encoding/CMakeLists.txt ceph-15.2.15-fix_tests/src/test/encoding/CMakeLists.txt
--- ceph-15.2.15/src/test/encoding/CMakeLists.txt 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/test/encoding/CMakeLists.txt 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-fix_tests/src/test/encoding/CMakeLists.txt 2022-02-07 00:15:45.650300949 +1030 +++ ceph-15.2.15-fix_tests/src/test/encoding/CMakeLists.txt 2023-02-03 23:15:37.500879543 +1030
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
# scripts # scripts
add_ceph_test(check-generated.sh ${CMAKE_CURRENT_SOURCE_DIR}/check-generated.sh) add_ceph_test(check-generated.sh ${CMAKE_CURRENT_SOURCE_DIR}/check-generated.sh)
+set_tests_properties(check-generated.sh PROPERTIES TIMEOUT 18000) +set_tests_properties(check-generated.sh PROPERTIES TIMEOUT 18000)
add_ceph_test(readable.sh ${CMAKE_CURRENT_SOURCE_DIR}/readable.sh) add_ceph_test(readable.sh ${CMAKE_CURRENT_SOURCE_DIR}/readable.sh)
+set_tests_properties(readable.sh PROPERTIES TIMEOUT 36000) +set_tests_properties(readable.sh PROPERTIES TIMEOUT 36000)
diff -uNr ceph-15.2.15/src/test/mgr/CMakeLists.txt ceph-15.2.15-fix_tests/src/test/mgr/CMakeLists.txt diff -uNr --no-dereference ceph-15.2.15/src/test/mgr/CMakeLists.txt ceph-15.2.15-fix_tests/src/test/mgr/CMakeLists.txt
--- ceph-15.2.15/src/test/mgr/CMakeLists.txt 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/test/mgr/CMakeLists.txt 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-fix_tests/src/test/mgr/CMakeLists.txt 2022-02-07 00:15:45.650300949 +1030 +++ ceph-15.2.15-fix_tests/src/test/mgr/CMakeLists.txt 2023-02-03 23:15:37.500879543 +1030
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
if(WITH_MGR_DASHBOARD_FRONTEND) if(WITH_MGR_DASHBOARD_FRONTEND)
if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM") if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM")
...@@ -74,9 +86,9 @@ diff -uNr ceph-15.2.15/src/test/mgr/CMakeLists.txt ceph-15.2.15-fix_tests/src/te ...@@ -74,9 +86,9 @@ diff -uNr ceph-15.2.15/src/test/mgr/CMakeLists.txt ceph-15.2.15-fix_tests/src/te
endif(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM") endif(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM")
add_ceph_test(mgr-dashboard-smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/mgr-dashboard-smoke.sh) add_ceph_test(mgr-dashboard-smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/mgr-dashboard-smoke.sh)
diff -uNr ceph-15.2.15/src/test/objectstore/CMakeLists.txt ceph-15.2.15-fix_tests/src/test/objectstore/CMakeLists.txt diff -uNr --no-dereference ceph-15.2.15/src/test/objectstore/CMakeLists.txt ceph-15.2.15-fix_tests/src/test/objectstore/CMakeLists.txt
--- ceph-15.2.15/src/test/objectstore/CMakeLists.txt 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/test/objectstore/CMakeLists.txt 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-fix_tests/src/test/objectstore/CMakeLists.txt 2022-02-07 00:15:45.650300949 +1030 +++ ceph-15.2.15-fix_tests/src/test/objectstore/CMakeLists.txt 2023-02-03 23:15:37.500879543 +1030
@@ -131,6 +131,7 @@ @@ -131,6 +131,7 @@
test_bluefs.cc test_bluefs.cc
) )
...@@ -93,9 +105,9 @@ diff -uNr ceph-15.2.15/src/test/objectstore/CMakeLists.txt ceph-15.2.15-fix_test ...@@ -93,9 +105,9 @@ diff -uNr ceph-15.2.15/src/test/objectstore/CMakeLists.txt ceph-15.2.15-fix_test
target_link_libraries(unittest_bdev os global) target_link_libraries(unittest_bdev os global)
endif(WITH_BLUESTORE) endif(WITH_BLUESTORE)
diff -uNr ceph-15.2.15/src/test/objectstore/test_bluefs.cc ceph-15.2.15-fix_tests/src/test/objectstore/test_bluefs.cc diff -uNr --no-dereference ceph-15.2.15/src/test/objectstore/test_bluefs.cc ceph-15.2.15-fix_tests/src/test/objectstore/test_bluefs.cc
--- ceph-15.2.15/src/test/objectstore/test_bluefs.cc 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/test/objectstore/test_bluefs.cc 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-fix_tests/src/test/objectstore/test_bluefs.cc 2022-02-07 00:16:23.980424148 +1030 +++ ceph-15.2.15-fix_tests/src/test/objectstore/test_bluefs.cc 2023-02-03 23:15:37.500879543 +1030
@@ -263,13 +263,13 @@ @@ -263,13 +263,13 @@
for (unsigned i = 0; i < 3*1024*1048576ull / sizeof(buf); ++i) { for (unsigned i = 0; i < 3*1024*1048576ull / sizeof(buf); ++i) {
h->append(buf, sizeof(buf)); h->append(buf, sizeof(buf));
...@@ -112,9 +124,9 @@ diff -uNr ceph-15.2.15/src/test/objectstore/test_bluefs.cc ceph-15.2.15-fix_test ...@@ -112,9 +124,9 @@ diff -uNr ceph-15.2.15/src/test/objectstore/test_bluefs.cc ceph-15.2.15-fix_test
fs.close_writer(h); fs.close_writer(h);
} }
{ {
diff -uNr ceph-15.2.15/src/test/osd/CMakeLists.txt ceph-15.2.15-fix_tests/src/test/osd/CMakeLists.txt diff -uNr --no-dereference ceph-15.2.15/src/test/osd/CMakeLists.txt ceph-15.2.15-fix_tests/src/test/osd/CMakeLists.txt
--- ceph-15.2.15/src/test/osd/CMakeLists.txt 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/test/osd/CMakeLists.txt 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-fix_tests/src/test/osd/CMakeLists.txt 2022-02-07 00:15:45.650300949 +1030 +++ ceph-15.2.15-fix_tests/src/test/osd/CMakeLists.txt 2023-02-03 23:15:37.500879543 +1030
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
# scripts # scripts
...@@ -123,9 +135,9 @@ diff -uNr ceph-15.2.15/src/test/osd/CMakeLists.txt ceph-15.2.15-fix_tests/src/te ...@@ -123,9 +135,9 @@ diff -uNr ceph-15.2.15/src/test/osd/CMakeLists.txt ceph-15.2.15-fix_tests/src/te
# unittest_osdmap # unittest_osdmap
add_executable(unittest_osdmap add_executable(unittest_osdmap
diff -uNr ceph-15.2.15/src/test/osd/TestOSDScrub.cc ceph-15.2.15-fix_tests/src/test/osd/TestOSDScrub.cc diff -uNr --no-dereference ceph-15.2.15/src/test/osd/TestOSDScrub.cc ceph-15.2.15-fix_tests/src/test/osd/TestOSDScrub.cc
--- ceph-15.2.15/src/test/osd/TestOSDScrub.cc 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/test/osd/TestOSDScrub.cc 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-fix_tests/src/test/osd/TestOSDScrub.cc 2022-02-07 00:15:45.650300949 +1030 +++ ceph-15.2.15-fix_tests/src/test/osd/TestOSDScrub.cc 2023-02-03 23:15:37.501879546 +1030
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
g_ceph_context->_conf.set_val("osd_scrub_begin_hour", "0"); g_ceph_context->_conf.set_val("osd_scrub_begin_hour", "0");
g_ceph_context->_conf.set_val("osd_scrub_end_hour", "24"); g_ceph_context->_conf.set_val("osd_scrub_end_hour", "24");
...@@ -135,9 +147,9 @@ diff -uNr ceph-15.2.15/src/test/osd/TestOSDScrub.cc ceph-15.2.15-fix_tests/src/t ...@@ -135,9 +147,9 @@ diff -uNr ceph-15.2.15/src/test/osd/TestOSDScrub.cc ceph-15.2.15-fix_tests/src/t
tm.tm_isdst = -1; tm.tm_isdst = -1;
strptime("2015-01-16 12:05:13", "%Y-%m-%d %H:%M:%S", &tm); strptime("2015-01-16 12:05:13", "%Y-%m-%d %H:%M:%S", &tm);
utime_t now = utime_t(mktime(&tm), 0); utime_t now = utime_t(mktime(&tm), 0);
diff -uNr ceph-15.2.15/src/test/smoke.sh ceph-15.2.15-fix_tests/src/test/smoke.sh diff -uNr --no-dereference ceph-15.2.15/src/test/smoke.sh ceph-15.2.15-fix_tests/src/test/smoke.sh
--- ceph-15.2.15/src/test/smoke.sh 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/test/smoke.sh 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-fix_tests/src/test/smoke.sh 2022-02-07 00:15:45.650300949 +1030 +++ ceph-15.2.15-fix_tests/src/test/smoke.sh 2023-02-03 23:15:37.501879546 +1030
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
ceph osd out 0 ceph osd out 0
wait_for_clean wait_for_clean
...@@ -147,9 +159,9 @@ diff -uNr ceph-15.2.15/src/test/smoke.sh ceph-15.2.15-fix_tests/src/test/smoke.s ...@@ -147,9 +159,9 @@ diff -uNr ceph-15.2.15/src/test/smoke.sh ceph-15.2.15-fix_tests/src/test/smoke.s
wait_for_clean wait_for_clean
ceph osd in 0 ceph osd in 0
diff -uNr ceph-15.2.15/src/test/test_ipaddr.cc ceph-15.2.15-fix_tests/src/test/test_ipaddr.cc diff -uNr --no-dereference ceph-15.2.15/src/test/test_ipaddr.cc ceph-15.2.15-fix_tests/src/test/test_ipaddr.cc
--- ceph-15.2.15/src/test/test_ipaddr.cc 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/test/test_ipaddr.cc 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-fix_tests/src/test/test_ipaddr.cc 2022-02-07 00:15:45.651300952 +1030 +++ ceph-15.2.15-fix_tests/src/test/test_ipaddr.cc 2023-02-03 23:15:37.501879546 +1030
@@ -186,6 +186,7 @@ @@ -186,6 +186,7 @@
struct sockaddr_in a_three; struct sockaddr_in a_three;
...@@ -166,3 +178,15 @@ diff -uNr ceph-15.2.15/src/test/test_ipaddr.cc ceph-15.2.15-fix_tests/src/test/t ...@@ -166,3 +178,15 @@ diff -uNr ceph-15.2.15/src/test/test_ipaddr.cc ceph-15.2.15-fix_tests/src/test/t
ipv6(&a_one, "::1"); ipv6(&a_one, "::1");
one.ifa_addr = (struct sockaddr*)&a_one; one.ifa_addr = (struct sockaddr*)&a_one;
one.ifa_name = lo; one.ifa_name = lo;
diff -uNr --no-dereference ceph-15.2.15/src/tools/setup-virtualenv.sh ceph-15.2.15-fix_tests/src/tools/setup-virtualenv.sh
--- ceph-15.2.15/src/tools/setup-virtualenv.sh 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-fix_tests/src/tools/setup-virtualenv.sh 2023-02-03 23:18:46.781452157 +1030
@@ -91,7 +91,7 @@
pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install \
$USE_FEATURE \
$NO_INDEX \
- --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1'
+ --find-links=file://$(pwd)/wheelhouse 'tox>=2.9.1,<=4.4.2'
require_files=$(ls *requirements*.txt 2>/dev/null) || true
constraint_files=$(ls *constraints*.txt 2>/dev/null) || true
ceph-15.2.15-no_use_feature.patch
View file @ 452dc412
...@@ -24,7 +24,7 @@ diff -uNr ceph-15.2.15/src/tools/setup-virtualenv.sh ceph-15.2.15-no_use_feature ...@@ -24,7 +24,7 @@ diff -uNr ceph-15.2.15/src/tools/setup-virtualenv.sh ceph-15.2.15-no_use_feature
pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install \ pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install \
- $USE_FEATURE \ - $USE_FEATURE \
$NO_INDEX \ $NO_INDEX \
--find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1' --find-links=file://$(pwd)/wheelhouse 'tox>=2.9.1,<=4.4.2'
@@ -103,7 +95,6 @@ @@ -103,7 +95,6 @@
NO_INDEX='' NO_INDEX=''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment