Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
ceph
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
ceph
Commits
eb8d7c70
Commit
eb8d7c70
authored
Jan 23, 2022
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Increased timeout of unittest_bdev to 2 hours to allow it to pass on slow backing store
parent
53f4704c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
12 deletions
+20
-12
ceph-15.2.4-fix_tests.patch
ceph-15.2.4-fix_tests.patch
+20
-12
No files found.
ceph-15.2.4-fix_tests.patch
View file @
eb8d7c70
diff -uNr ceph-15.2.4/src/pybind/mgr/dashboard/requirements-lint.txt ceph-15.2.4-fix_tests/src/pybind/mgr/dashboard/requirements-lint.txt
diff -uNr ceph-15.2.4/src/pybind/mgr/dashboard/requirements-lint.txt ceph-15.2.4-fix_tests/src/pybind/mgr/dashboard/requirements-lint.txt
--- ceph-15.2.4/src/pybind/mgr/dashboard/requirements-lint.txt 2020-07-01 01:10:51.000000000 +0930
--- ceph-15.2.4/src/pybind/mgr/dashboard/requirements-lint.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/pybind/mgr/dashboard/requirements-lint.txt 202
1-07-10 14:51:40.217564019 +09
30
+++ ceph-15.2.4-fix_tests/src/pybind/mgr/dashboard/requirements-lint.txt 202
2-01-23 12:16:55.331322609 +10
30
@@ -1,4 +1,5 @@
@@ -1,4 +1,5 @@
pylint==2.3.1; python_version >= '3'
pylint==2.3.1; python_version >= '3'
+astroid==2.5.8; python_version >= '3'
+astroid==2.5.8; python_version >= '3'
...
@@ -9,7 +9,7 @@ diff -uNr ceph-15.2.4/src/pybind/mgr/dashboard/requirements-lint.txt ceph-15.2.4
...
@@ -9,7 +9,7 @@ diff -uNr ceph-15.2.4/src/pybind/mgr/dashboard/requirements-lint.txt ceph-15.2.4
#TODO: Fix docstring issues: https://tracker.ceph.com/issues/41224
#TODO: Fix docstring issues: https://tracker.ceph.com/issues/41224
diff -uNr ceph-15.2.4/src/pybind/mgr/insights/tox.ini ceph-15.2.4-fix_tests/src/pybind/mgr/insights/tox.ini
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/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 202
1-07-10 14:51:07.139460072 +09
30
+++ ceph-15.2.4-fix_tests/src/pybind/mgr/insights/tox.ini 202
2-01-23 12:16:55.370322731 +10
30
@@ -8,6 +8,7 @@
@@ -8,6 +8,7 @@
deps =
deps =
pytest
pytest
...
@@ -20,7 +20,7 @@ diff -uNr ceph-15.2.4/src/pybind/mgr/insights/tox.ini ceph-15.2.4-fix_tests/src/
...
@@ -20,7 +20,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
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
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/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 202
1-07-10 14:51:07.616461571 +09
30
+++ ceph-15.2.4-fix_tests/src/test/cli/ceph-conf/env-vs-args.t 202
2-01-23 12:16:55.371322734 +10
30
@@ -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.
...
@@ -35,7 +35,7 @@ diff -uNr ceph-15.2.4/src/test/cli/ceph-conf/env-vs-args.t ceph-15.2.4-fix_tests
...
@@ -35,7 +35,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
# 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
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/src/test/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/CMakeLists.txt 202
1-07-10 14:51:07.707461857 +09
30
+++ ceph-15.2.4-fix_tests/src/test/CMakeLists.txt 202
2-01-23 12:16:55.371322734 +10
30
@@ -528,11 +528,17 @@
@@ -528,11 +528,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
...
@@ -64,7 +64,7 @@ diff -uNr ceph-15.2.4/src/test/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/CMa
...
@@ -64,7 +64,7 @@ diff -uNr ceph-15.2.4/src/test/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/CMa
TEST ${tox_tests}
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
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/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 202
1-07-10 14:51:07.730461929 +09
30
+++ ceph-15.2.4-fix_tests/src/test/common/test_lockdep.cc 202
2-01-23 12:16:55.371322734 +10
30
@@ -16,7 +16,7 @@
@@ -16,7 +16,7 @@
{
{
protected:
protected:
...
@@ -76,7 +76,7 @@ diff -uNr ceph-15.2.4/src/test/common/test_lockdep.cc ceph-15.2.4-fix_tests/src/
...
@@ -76,7 +76,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);
CephInitParameters params(CEPH_ENTITY_TYPE_CLIENT);
diff -uNr ceph-15.2.4/src/test/common/Throttle.cc ceph-15.2.4-fix_tests/src/test/common/Throttle.cc
diff -uNr ceph-15.2.4/src/test/common/Throttle.cc ceph-15.2.4-fix_tests/src/test/common/Throttle.cc
--- ceph-15.2.4/src/test/common/Throttle.cc 2020-07-01 01:10:51.000000000 +0930
--- ceph-15.2.4/src/test/common/Throttle.cc 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/common/Throttle.cc 202
1-07-10 14:51:07.730461929 +09
30
+++ ceph-15.2.4-fix_tests/src/test/common/Throttle.cc 202
2-01-23 12:16:55.371322734 +10
30
@@ -332,7 +332,7 @@
@@ -332,7 +332,7 @@
3,
3,
6);
6);
...
@@ -88,7 +88,7 @@ diff -uNr ceph-15.2.4/src/test/common/Throttle.cc ceph-15.2.4-fix_tests/src/test
...
@@ -88,7 +88,7 @@ diff -uNr ceph-15.2.4/src/test/common/Throttle.cc ceph-15.2.4-fix_tests/src/test
}
}
diff -uNr ceph-15.2.4/src/test/encoding/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/encoding/CMakeLists.txt
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/src/test/encoding/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/encoding/CMakeLists.txt 202
1-07-10 14:51:07.841462278 +09
30
+++ ceph-15.2.4-fix_tests/src/test/encoding/CMakeLists.txt 202
2-01-23 12:16:55.371322734 +10
30
@@ -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)
...
@@ -97,7 +97,7 @@ diff -uNr ceph-15.2.4/src/test/encoding/CMakeLists.txt ceph-15.2.4-fix_tests/src
...
@@ -97,7 +97,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 36000)
+set_tests_properties(readable.sh PROPERTIES TIMEOUT 36000)
diff -uNr ceph-15.2.4/src/test/mgr/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/mgr/CMakeLists.txt
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/src/test/mgr/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/mgr/CMakeLists.txt 202
1-07-10 14:51:07.858462332 +09
30
+++ ceph-15.2.4-fix_tests/src/test/mgr/CMakeLists.txt 202
2-01-23 12:16:55.371322734 +10
30
@@ -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")
...
@@ -108,7 +108,7 @@ diff -uNr ceph-15.2.4/src/test/mgr/CMakeLists.txt ceph-15.2.4-fix_tests/src/test
...
@@ -108,7 +108,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)
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
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/src/test/objectstore/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/objectstore/CMakeLists.txt 202
1-07-10 14:51:07.890462432 +09
30
+++ ceph-15.2.4-fix_tests/src/test/objectstore/CMakeLists.txt 202
2-01-23 12:20:34.429010487 +10
30
@@ -131,6 +131,7 @@
@@ -131,6 +131,7 @@
test_bluefs.cc
test_bluefs.cc
)
)
...
@@ -117,9 +117,17 @@ diff -uNr ceph-15.2.4/src/test/objectstore/CMakeLists.txt ceph-15.2.4-fix_tests/
...
@@ -117,9 +117,17 @@ diff -uNr ceph-15.2.4/src/test/objectstore/CMakeLists.txt ceph-15.2.4-fix_tests/
target_link_libraries(unittest_bluefs os global)
target_link_libraries(unittest_bluefs os global)
# unittest_bluestore_types
# unittest_bluestore_types
@@ -145,6 +146,7 @@
test_bdev.cc
)
add_ceph_unittest(unittest_bdev)
+ set_tests_properties(unittest_bdev PROPERTIES TIMEOUT 7200)
target_link_libraries(unittest_bdev os global)
endif(WITH_BLUESTORE)
diff -uNr ceph-15.2.4/src/test/osd/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/osd/CMakeLists.txt
diff -uNr ceph-15.2.4/src/test/osd/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/osd/CMakeLists.txt
--- ceph-15.2.4/src/test/osd/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
--- ceph-15.2.4/src/test/osd/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/osd/CMakeLists.txt 202
1-07-10 14:51:07.890462432 +09
30
+++ ceph-15.2.4-fix_tests/src/test/osd/CMakeLists.txt 202
2-01-23 12:16:55.371322734 +10
30
@@ -35,6 +35,7 @@
@@ -35,6 +35,7 @@
# scripts
# scripts
...
@@ -130,7 +138,7 @@ diff -uNr ceph-15.2.4/src/test/osd/CMakeLists.txt ceph-15.2.4-fix_tests/src/test
...
@@ -130,7 +138,7 @@ diff -uNr ceph-15.2.4/src/test/osd/CMakeLists.txt ceph-15.2.4-fix_tests/src/test
add_executable(unittest_osdmap
add_executable(unittest_osdmap
diff -uNr ceph-15.2.4/src/test/osd/TestOSDScrub.cc ceph-15.2.4-fix_tests/src/test/osd/TestOSDScrub.cc
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/src/test/osd/TestOSDScrub.cc 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/osd/TestOSDScrub.cc 202
1-07-10 14:51:08.522464418 +09
30
+++ ceph-15.2.4-fix_tests/src/test/osd/TestOSDScrub.cc 202
2-01-23 12:16:55.371322734 +10
30
@@ -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");
...
@@ -142,7 +150,7 @@ diff -uNr ceph-15.2.4/src/test/osd/TestOSDScrub.cc ceph-15.2.4-fix_tests/src/tes
...
@@ -142,7 +150,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);
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
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/src/test/smoke.sh 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/smoke.sh 202
1-07-10 14:51:08.547464497 +09
30
+++ ceph-15.2.4-fix_tests/src/test/smoke.sh 202
2-01-23 12:16:55.372322737 +10
30
@@ -53,7 +53,7 @@
@@ -53,7 +53,7 @@
ceph osd out 0
ceph osd out 0
wait_for_clean
wait_for_clean
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment