Skip to content

GitLab

C
ceph
Commit 038691c9 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Increased timeout to 7200 for unittest_bluefs

parent 71f9a52a
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 4 deletions
ceph-14.2.4-fix_tests.patch
View file @ 038691c9
diff -uNr ceph-14.2.4/src/pybind/mgr/dashboard/tests/test_task.py ceph-14.2.4-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py
--- ceph-14.2.4/src/pybind/mgr/dashboard/tests/test_task.py 2019-09-14 03:37:41.000000000 +0930
+++ ceph-14.2.4-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py 2019-09-26 14:11:15.877987836 +0930
+++ ceph-14.2.4-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py 2019-09-27 18:11:31.777787281 +0930
@@ -177,57 +177,6 @@
self.assertEqual(str(fn_t[0].exception), "Task Unexpected Exception")
self.assertEqual(fn_t[0].progress, 70)
......@@ -108,7 +108,7 @@ diff -uNr ceph-14.2.4/src/pybind/mgr/dashboard/tests/test_task.py ceph-14.2.4-fi
state, result = task1.run('test9/task1')
diff -uNr ceph-14.2.4/src/test/CMakeLists.txt ceph-14.2.4-fix_tests/src/test/CMakeLists.txt
--- ceph-14.2.4/src/test/CMakeLists.txt 2019-09-14 03:37:41.000000000 +0930
+++ ceph-14.2.4-fix_tests/src/test/CMakeLists.txt 2019-09-26 14:11:15.878987839 +0930
+++ ceph-14.2.4-fix_tests/src/test/CMakeLists.txt 2019-09-27 18:11:31.778787284 +0930
@@ -529,6 +529,7 @@
if(WITH_RBD)
......@@ -119,7 +119,7 @@ diff -uNr ceph-14.2.4/src/test/CMakeLists.txt ceph-14.2.4-fix_tests/src/test/CMa
endif(FREEBSD)
diff -uNr ceph-14.2.4/src/test/mgr/CMakeLists.txt ceph-14.2.4-fix_tests/src/test/mgr/CMakeLists.txt
--- ceph-14.2.4/src/test/mgr/CMakeLists.txt 2019-09-14 03:37:41.000000000 +0930
+++ ceph-14.2.4-fix_tests/src/test/mgr/CMakeLists.txt 2019-09-26 14:11:15.878987839 +0930
+++ ceph-14.2.4-fix_tests/src/test/mgr/CMakeLists.txt 2019-09-27 18:11:31.779787287 +0930
@@ -2,6 +2,7 @@
if(WITH_MGR_DASHBOARD_FRONTEND)
if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM")
......@@ -128,9 +128,20 @@ diff -uNr ceph-14.2.4/src/test/mgr/CMakeLists.txt ceph-14.2.4-fix_tests/src/test
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)
diff -uNr ceph-14.2.4/src/test/objectstore/CMakeLists.txt ceph-14.2.4-fix_tests/src/test/objectstore/CMakeLists.txt
--- ceph-14.2.4/src/test/objectstore/CMakeLists.txt 2019-09-14 03:37:41.000000000 +0930
+++ ceph-14.2.4-fix_tests/src/test/objectstore/CMakeLists.txt 2019-09-27 18:21:41.312595868 +0930
@@ -110,6 +110,7 @@
test_bluefs.cc
)
add_ceph_unittest(unittest_bluefs)
+ set_tests_properties(unittest_bluefs PROPERTIES TIMEOUT 7200)
target_link_libraries(unittest_bluefs os global)
# unittest_bluestore_types
diff -uNr ceph-14.2.4/src/test/osd/TestOSDScrub.cc ceph-14.2.4-fix_tests/src/test/osd/TestOSDScrub.cc
--- ceph-14.2.4/src/test/osd/TestOSDScrub.cc 2019-09-14 03:37:41.000000000 +0930
+++ ceph-14.2.4-fix_tests/src/test/osd/TestOSDScrub.cc 2019-09-26 14:11:44.365070039 +0930
+++ ceph-14.2.4-fix_tests/src/test/osd/TestOSDScrub.cc 2019-09-27 18:11:31.779787287 +0930
@@ -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");
......
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