Use toml for ConfigureTestRestart

2020-10-04 18:18:11 -07:00 · 2020-10-04 18:18:11 -07:00 · 9c2cc9ec56
parent b4ffc04e4e
commit 9c2cc9ec56
5 changed files with 41 additions and 32 deletions
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -168,8 +168,8 @@ if(WITH_PYTHON)
  add_fdb_test(TEST_FILES rare/TransactionTagSwizzledApiCorrectness.toml)
  add_fdb_test(TEST_FILES rare/WriteTagThrottling.toml)
  add_fdb_test(
-    TEST_FILES restarting/from_7.0.0/ConfigureTestRestart-1.txt
-               restarting/from_7.0.0/ConfigureTestRestart-2.txt)
+    TEST_FILES restarting/from_7.0.0/ConfigureTestRestart-1.toml
+               restarting/from_7.0.0/ConfigureTestRestart-2.toml)
  add_fdb_test(
    TEST_FILES restarting/from_5.0.0/CycleTestRestart-1.txt
               restarting/from_5.0.0/CycleTestRestart-2.txt)
--- a/tests/restarting/from_7.0.0/ConfigureTestRestart-1.toml
+++ b/tests/restarting/from_7.0.0/ConfigureTestRestart-1.toml
@ -0,0 +1,22 @@
+[[test]]
+testTitle='CloggedConfigureDatabaseTest'
+clearAfterTest=false
+
+    [[test.workload]]
+    testName='ConfigureDatabase'
+    testDuration=30.0
+
+    [[test.workload]]
+    testName='RandomClogging'
+    testDuration=30.0
+
+    [[test.workload]]
+    testName='RandomClogging'
+    testDuration=30.0
+    scale=0.1
+    clogginess=2.0
+
+    [[test.workload]]
+    testName='SaveAndKill'
+    restartInfoLocation='simfdb/restartInfo.ini'
+    testDuration=30.0
--- a/tests/restarting/from_7.0.0/ConfigureTestRestart-1.txt
+++ b/tests/restarting/from_7.0.0/ConfigureTestRestart-1.txt
@ -1,17 +0,0 @@
-testTitle=CloggedConfigureDatabaseTest
-clearAfterTest=false
-
-    testName=ConfigureDatabase
-    testDuration=30.0
-
-    testName=RandomClogging
-    testDuration=30.0
-
-    testName=RandomClogging
-    testDuration=30.0
-    scale=0.1
-    clogginess=2.0
-
-    testName=SaveAndKill
-    restartInfoLocation=simfdb/restartInfo.ini
-    testDuration=30.0
--- a/tests/restarting/from_7.0.0/ConfigureTestRestart-2.toml
+++ b/tests/restarting/from_7.0.0/ConfigureTestRestart-2.toml
@ -0,0 +1,17 @@
+[[test]]
+testTitle='CloggedConfigureDatabaseTest'
+runSetup=false
+
+    [[test.workload]]
+    testName='ConfigureDatabase'
+    testDuration=300.0
+
+    [[test.workload]]
+    testName='RandomClogging'
+    testDuration=300.0
+
+    [[test.workload]]
+    testName='RandomClogging'
+    testDuration=300.0
+    scale=0.1
+    clogginess=2.0
--- a/tests/restarting/from_7.0.0/ConfigureTestRestart-2.txt
+++ b/tests/restarting/from_7.0.0/ConfigureTestRestart-2.txt
@ -1,13 +0,0 @@
-testTitle=CloggedConfigureDatabaseTest
-runSetup=false
-
-    testName=ConfigureDatabase
-    testDuration=300.0
-
-    testName=RandomClogging
-    testDuration=300.0
-
-    testName=RandomClogging
-    testDuration=300.0
-    scale=0.1
-    clogginess=2.0