Skip to content

GitLab

C
ceph
Commit 8742c559 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Test smoke.sh may take longer than 3600 seconds on slow machine - increase it to 7200 seconds

parent cd17c379
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 9 deletions
ceph-15.2.4-fix_tests.patch
View file @ 8742c559
diff -uNr ceph-15.2.4/src/pybind/mgr/insights/tox.ini ceph-15.2.4-fix_tests/src/pybind/mgr/insights/tox.ini
--- ceph-15.2.4/src/pybind/mgr/insights/tox.ini 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/pybind/mgr/insights/tox.ini 2020-12-11 18:00:06.748174454 +1030
+++ ceph-15.2.4-fix_tests/src/pybind/mgr/insights/tox.ini 2020-12-27 13:50:36.258943309 +1030
@@ -8,6 +8,7 @@
deps =
pytest
......@@ -11,7 +11,7 @@ diff -uNr ceph-15.2.4/src/pybind/mgr/insights/tox.ini ceph-15.2.4-fix_tests/src/
py3: PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.3
diff -uNr ceph-15.2.4/src/test/cli/ceph-conf/env-vs-args.t ceph-15.2.4-fix_tests/src/test/cli/ceph-conf/env-vs-args.t
--- ceph-15.2.4/src/test/cli/ceph-conf/env-vs-args.t 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/cli/ceph-conf/env-vs-args.t 2020-12-11 18:03:14.355804190 +1030
+++ ceph-15.2.4-fix_tests/src/test/cli/ceph-conf/env-vs-args.t 2020-12-27 13:50:36.260943316 +1030
@@ -2,9 +2,9 @@
$ env CEPH_CONF=from-env ceph-conf -s foo bar
did not load config file, using default settings.
......@@ -26,7 +26,7 @@ diff -uNr ceph-15.2.4/src/test/cli/ceph-conf/env-vs-args.t ceph-15.2.4-fix_tests
# command-line arguments should override environment
diff -uNr ceph-15.2.4/src/test/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/CMakeLists.txt
--- ceph-15.2.4/src/test/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/CMakeLists.txt 2020-12-11 18:03:14.356804193 +1030
+++ ceph-15.2.4-fix_tests/src/test/CMakeLists.txt 2020-12-27 13:51:38.719165590 +1030
@@ -528,11 +528,17 @@
# Run rbd-unit-tests separate so they an run in parallel
# For values see: src/include/rbd/features.h
......@@ -45,9 +45,17 @@ diff -uNr ceph-15.2.4/src/test/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/CMa
if(FREEBSD)
add_ceph_test(rbd-ggate.sh ${CMAKE_CURRENT_SOURCE_DIR}/rbd-ggate.sh)
endif(FREEBSD)
@@ -546,6 +552,7 @@
#add_ceph_test(test_pidfile.sh ${CMAKE_CURRENT_SOURCE_DIR}/test_pidfile.sh)
add_ceph_test(smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/smoke.sh)
+set_tests_properties(smoke.sh PROPERTIES TIMEOUT 7200)
set_property(
TEST ${tox_tests}
diff -uNr ceph-15.2.4/src/test/common/test_lockdep.cc ceph-15.2.4-fix_tests/src/test/common/test_lockdep.cc
--- ceph-15.2.4/src/test/common/test_lockdep.cc 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/common/test_lockdep.cc 2020-12-11 18:03:14.356804193 +1030
+++ ceph-15.2.4-fix_tests/src/test/common/test_lockdep.cc 2020-12-27 13:50:36.264943330 +1030
@@ -16,7 +16,7 @@
{
protected:
......@@ -59,7 +67,7 @@ diff -uNr ceph-15.2.4/src/test/common/test_lockdep.cc ceph-15.2.4-fix_tests/src/
CephInitParameters params(CEPH_ENTITY_TYPE_CLIENT);
diff -uNr ceph-15.2.4/src/test/encoding/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/encoding/CMakeLists.txt
--- ceph-15.2.4/src/test/encoding/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/encoding/CMakeLists.txt 2020-12-11 18:03:14.356804193 +1030
+++ ceph-15.2.4-fix_tests/src/test/encoding/CMakeLists.txt 2020-12-27 13:50:36.285943405 +1030
@@ -1,3 +1,5 @@
# scripts
add_ceph_test(check-generated.sh ${CMAKE_CURRENT_SOURCE_DIR}/check-generated.sh)
......@@ -68,7 +76,7 @@ diff -uNr ceph-15.2.4/src/test/encoding/CMakeLists.txt ceph-15.2.4-fix_tests/src
+set_tests_properties(readable.sh PROPERTIES TIMEOUT 18000)
diff -uNr ceph-15.2.4/src/test/mgr/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/mgr/CMakeLists.txt
--- ceph-15.2.4/src/test/mgr/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/mgr/CMakeLists.txt 2020-12-11 18:03:14.356804193 +1030
+++ ceph-15.2.4-fix_tests/src/test/mgr/CMakeLists.txt 2020-12-27 13:50:36.298943451 +1030
@@ -9,6 +9,7 @@
if(WITH_MGR_DASHBOARD_FRONTEND)
if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM")
......@@ -79,7 +87,7 @@ diff -uNr ceph-15.2.4/src/test/mgr/CMakeLists.txt ceph-15.2.4-fix_tests/src/test
add_ceph_test(mgr-dashboard-smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/mgr-dashboard-smoke.sh)
diff -uNr ceph-15.2.4/src/test/objectstore/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/objectstore/CMakeLists.txt
--- ceph-15.2.4/src/test/objectstore/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/objectstore/CMakeLists.txt 2020-12-11 18:03:14.356804193 +1030
+++ ceph-15.2.4-fix_tests/src/test/objectstore/CMakeLists.txt 2020-12-27 13:50:36.300943459 +1030
@@ -131,6 +131,7 @@
test_bluefs.cc
)
......@@ -90,7 +98,7 @@ diff -uNr ceph-15.2.4/src/test/objectstore/CMakeLists.txt ceph-15.2.4-fix_tests/
# unittest_bluestore_types
diff -uNr ceph-15.2.4/src/test/osd/TestOSDScrub.cc ceph-15.2.4-fix_tests/src/test/osd/TestOSDScrub.cc
--- ceph-15.2.4/src/test/osd/TestOSDScrub.cc 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/osd/TestOSDScrub.cc 2020-12-11 18:03:14.356804193 +1030
+++ ceph-15.2.4-fix_tests/src/test/osd/TestOSDScrub.cc 2020-12-27 13:50:36.301943462 +1030
@@ -70,7 +70,7 @@
g_ceph_context->_conf.set_val("osd_scrub_begin_hour", "0");
g_ceph_context->_conf.set_val("osd_scrub_end_hour", "24");
......@@ -102,7 +110,7 @@ diff -uNr ceph-15.2.4/src/test/osd/TestOSDScrub.cc ceph-15.2.4-fix_tests/src/tes
utime_t now = utime_t(mktime(&tm), 0);
diff -uNr ceph-15.2.4/src/test/smoke.sh ceph-15.2.4-fix_tests/src/test/smoke.sh
--- ceph-15.2.4/src/test/smoke.sh 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/smoke.sh 2020-12-11 18:03:14.356804193 +1030
+++ ceph-15.2.4-fix_tests/src/test/smoke.sh 2020-12-27 13:50:36.302943466 +1030
@@ -53,7 +53,7 @@
ceph osd out 0
wait_for_clean
......
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