apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-14 18:02:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade Test: Include only currently working tests into the ctest suite

Browse Source
This commit is contained in:
Vaidas Gasiunas 2022-04-12 20:03:29 +02:00
parent 1e2541f1db
commit 9e46128b6f
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bindings/c/CMakeLists.txt
View File

@ -258,7 +258,7 @@ endif()
--build-dir ${CMAKE_BINARY_DIR}
--disable-log-dump
--test-file ${CMAKE_SOURCE_DIR}/bindings/c/test/apitester/tests/upgrade/MixedApiWorkloadSingleThr.toml
--upgrade-path "6.2.30" "6.3.23" "7.0.0" "7.1.0"
--upgrade-path "6.2.30" "6.3.23" "7.0.0" "6.3.23"
--process-number 1
)
@ -267,17 +267,8 @@ endif()
--build-dir ${CMAKE_BINARY_DIR}
--disable-log-dump
--test-file ${CMAKE_SOURCE_DIR}/bindings/c/test/apitester/tests/upgrade/MixedApiWorkloadMultiThr.toml
--upgrade-path "6.3.23" "7.0.0" "7.1.0"
--process-number 1
)
add_test(NAME fdb_c_upgrade_from_70
COMMAND ${CMAKE_SOURCE_DIR}/tests/TestRunner/upgrade_test.py
--build-dir ${CMAKE_BINARY_DIR}
--disable-log-dump
--test-file ${CMAKE_SOURCE_DIR}/bindings/c/test/apitester/tests/upgrade/MixedApiWorkloadMultiThr.toml
--upgrade-path "7.0.0" "7.1.0" "7.0.0"
--process-number 1
--upgrade-path "6.3.23" "7.0.0" "6.3.23"
--process-number 3
)
endif()

2
bindings/c/test/apitester/TesterTransactionExecutor.cpp
View File

@ -32,7 +32,7 @@
namespace FdbApiTester {
constexpr int LONG_WAIT_TIME_US = 100000;
constexpr int LONG_WAIT_TIME_US = 1000000;
void TransactionActorBase::complete(fdb_error_t err) {
error = err;

4
tests/TestRunner/upgrade_test.py
View File

@ -28,7 +28,7 @@ SUPPORTED_VERSIONS = ["7.2.0", "7.1.0", "7.0.0", "6.3.24", "6.3.23",
FDB_DOWNLOAD_ROOT = "https://github.com/apple/foundationdb/releases/download/"
CURRENT_VERSION = "7.2.0"
HEALTH_CHECK_TIMEOUT_SEC = 5
PROGRESS_CHECK_TIMEOUT_SEC = 500
PROGRESS_CHECK_TIMEOUT_SEC = 30
def make_executable(path):
@ -441,7 +441,7 @@ if __name__ == "__main__":
print("data-dir: {}".format(test.data))
print("cluster-file: {}".format(test.etc.joinpath("fdb.cluster")))
errcode = test.exec_test(args)
if test.check_cluster_logs():
if not test.check_cluster_logs():
errcode = 1 if errcode == 0 else errcode
if errcode != 0 and not args.disable_log_dump:
test.dump_cluster_logs()