Split SnapTestSimpleRestart into two test cases

tests/CMakeLists.txt

@@ -107,6 +107,7 @@ add_fdb_test(TEST_FILES fast/RandomUnitTests.txt)
 add_fdb_test(TEST_FILES fast/SelectorCorrectness.txt)
 add_fdb_test(TEST_FILES fast/Sideband.txt)
 add_fdb_test(TEST_FILES fast/SidebandWithStatus.txt)
+add_fdb_test(TEST_FILES fast/SnapTestFailAndDisablePop.txt)
 add_fdb_test(TEST_FILES fast/SwizzledRollbackSideband.txt)
 add_fdb_test(TEST_FILES fast/SystemRebootTestCycle.txt)
 add_fdb_test(TEST_FILES fast/TaskBucketCorrectness.txt)

tests/fast/SnapTestFailAndDisablePop.txt

@@ -0,0 +1,40 @@
+; verify that the TLog popping disable times out and switches to enable mode
+; automatically, if not enabled specifically
+testTitle=SnapTLogPopDisableTimeout
+testName=SnapTest
+numSnaps=1
+maxSnapDelay=3.0
+testID=4
+snapCheck=true
+
+; TLog pop enable and disable UID mismatch
+testTitle=SnapTLogPopEnableDisableMismatch
+testName=SnapTest
+numSnaps=1
+maxSnapDelay=3.0
+testID=5
+snapCheck=true
+
+; snapCreate without TLogPopDisable
+testTitle=SnapCreateWithNoDisablePop
+testName=SnapTest
+numSnaps=1
+maxSnapDelay=3.0
+testID=6
+snapCheck=true
+
+; snapCreate and tlogPopDisable with mis-matched UID
+testTitle=SnapCreateDisableTLogPopMismatch
+testName=SnapTest
+numSnaps=1
+maxSnapDelay=3.0
+testID=7
+snapCheck=true
+
+; snapCreate with binary path that is not whitelisted
+testTitle=SnapCreateNotWhiteListedBinaryPath
+testName=SnapTest
+numSnaps=1
+maxSnapDelay=3.0
+testID=8
+snapCheck=false

tests/restarting/SnapTestSimpleRestart-2.txt

@@ -5,44 +5,3 @@ numSnaps=1
 maxSnapDelay=3.0
 testID=3
 snapCheck=false
-
-; verify that the TLog popping disable times out and switches to enable mode
-; automatically, if not enabled specifically
-testTitle=SnapTLogPopDisableTimeout
-testName=SnapTest
-numSnaps=1
-maxSnapDelay=3.0
-testID=4
-snapCheck=true
-
-; TLog pop enable and disable UID mismatch
-testTitle=SnapTLogPopEnableDisableMismatch
-testName=SnapTest
-numSnaps=1
-maxSnapDelay=3.0
-testID=5
-snapCheck=true
-
-; snapCreate without TLogPopDisable
-testTitle=SnapCreateWithNoDisablePop
-testName=SnapTest
-numSnaps=1
-maxSnapDelay=3.0
-testID=6
-snapCheck=true
-
-; snapCreate and tlogPopDisable with mis-matched UID
-testTitle=SnapCreateDisableTLogPopMismatch
-testName=SnapTest
-numSnaps=1
-maxSnapDelay=3.0
-testID=7
-snapCheck=true
-
-; snapCreate with binary path that is not whitelisted
-testTitle=SnapCreateNotWhiteListedBinaryPath
-testName=SnapTest
-numSnaps=1
-maxSnapDelay=3.0
-testID=8
-snapCheck=false