fixed conflicts with tests

tests/fast/CycleAndLock.txt

@@ -1,28 +0,0 @@
-testTitle=Clogged
-    testName=Cycle
-    transactionsPerSecond=2500.0
-    testDuration=60.0
-    expectedRate=0
-
-    testName=LockDatabase
-    lockAfter=15.0
-    unlockAfter=45.0
-
-    testName=RandomClogging
-    testDuration=30.0
-
-    testName=Rollback
-    meanDelay=30.0
-    testDuration=30.0
-
-    testName=Attrition
-    machinesToKill=10
-    machinesToLeave=3
-    reboot=true
-    testDuration=30.0
-
-    testName=Attrition
-    machinesToKill=10
-    machinesToLeave=3
-    reboot=true
-    testDuration=30.0

tests/fast/TxnStateStoreCycleTest.toml

@@ -40,3 +40,6 @@ testTitle = 'Clogged'
     machinesToLeave = 3
     reboot = true
     testDuration = 10.0
+
+    [[test.workload]]
+    testName = 'LockDatabaseFrequently'

tests/fast/TxnStateStoreCycleTest.txt

@@ -1,34 +0,0 @@
-testTitle=PreLoad
-    testName=BulkLoad
-    testDuration=3000.0
-    valueBytes=100
-    targetBytes=1000000
-    keyPrefix=\xff/TESTONLYtxnStateStore/notcycle/
-
-testTitle=Clogged
-    testName=Cycle
-    transactionsPerSecond=2500.0
-    testDuration=10.0
-    expectedRate=0
-    keyPrefix=\xff/TESTONLYtxnStateStore/
-
-    testName=RandomClogging
-    testDuration=10.0
-
-    testName=Rollback
-    meanDelay=10.0
-    testDuration=10.0
-
-    testName=Attrition
-    machinesToKill=10
-    machinesToLeave=3
-    reboot=true
-    testDuration=10.0
-
-    testName=Attrition
-    machinesToKill=10
-    machinesToLeave=3
-    reboot=true
-    testDuration=10.0
-
-    testName=LockDatabaseFrequently

tests/fast/VersionStamp.toml

@@ -4,3 +4,6 @@ testTitle = 'VersionStamp'
     [[test.workload]]
     testName = 'VersionStamp'
     soleOwnerOfMetadataVersionKey = true
+
+    [[test.workload]]
+    testName = 'LockDatabaseFrequently'

tests/fast/VersionStamp.txt

@@ -1,5 +0,0 @@
-testTitle=VersionStamp
-testName=VersionStamp
-soleOwnerOfMetadataVersionKey=true
-
-testName=LockDatabaseFrequently

tests/slow/ParallelRestoreOldBackupApiCorrectnessAtomicRestore.toml

@@ -25,6 +25,7 @@ runSetup = true
     numClearRanges = 10
     maxTransactionBytes = 500000
     randomTestDuration = 60
+    resetDBTimeout = 7200
 
     [[test.workload]]
     testName = 'AtomicRestore'

tests/slow/ParallelRestoreOldBackupApiCorrectnessAtomicRestore.txt

@@ -1,38 +0,0 @@
-testTitle=ApiCorrectnessTest
-testName=ApiCorrectness
-runSetup=true
-clearAfterTest=true
-numKeys=5000
-onlyLowerCase=true
-shortKeysRatio=0.5
-minShortKeyLength=1
-maxShortKeyLength=3
-minLongKeyLength=1
-maxLongKeyLength=128
-minValueLength=1
-maxValueLength=1000
-numGets=1000
-numGetRanges=100
-numGetRangeSelectors=100
-numGetKeys=100
-numClears=100
-numClearRanges=10
-maxTransactionBytes=500000
-randomTestDuration=60
-resetDBTimeout=7200
-timeout=360000
-
-testName=AtomicRestore
-startAfter=10.0
-restoreAfter=50.0
-clearAfterTest=false
-simBackupAgents=BackupToFile
-fastRestore=true
-usePartitionedLogs=false
-
-; Each testName=RunRestoreWorkerWorkload creates a restore worker
-; We need at least 3 restore workers: master, loader, and applier
-testName=RunRestoreWorkerWorkload
-
-;timeout is in seconds
-timeout=360000

tests/slow/ParallelRestoreOldBackupCorrectnessCycle.toml

@@ -10,8 +10,8 @@ timeout = 360000
 
     [[test.workload]]
     testName = 'Cycle'
-    #    nodeCount=30000
-    nodeCount = 1000
+    nodeCount=30000
+    #    nodeCount = 1000
     #    transactionsPerSecond=500.0
     transactionsPerSecond = 2500.0
     testDuration = 30.0

tests/slow/ParallelRestoreOldBackupCorrectnessCycle.txt

@@ -1,51 +0,0 @@
-testTitle=BackupAndRestore
-     testName=Cycle
-     nodeCount=30000
- ;    nodeCount=1000
-     transactionsPerSecond=2500.0
-     testDuration=30.0
-     expectedRate=0
-     clearAfterTest=false
- ;	keyPrefix=!
-
- ; Each testName=RunRestoreWorkerWorkload creates a restore worker
- ; We need at least 3 restore workers: master, loader, and applier
-     testName=RunRestoreWorkerWorkload
-
- ; Test case for parallel restore
-     testName=BackupAndParallelRestoreCorrectness
-     backupAfter=10.0
-     restoreAfter=60.0
-     clearAfterTest=false
-     simBackupAgents=BackupToFile
- ; backupRangesCount<0 means backup the entire normal keyspace
-     backupRangesCount=-1
-     usePartitionedLogs=false
-
-     testName=RandomClogging
-     testDuration=90.0
-
-     testName=Rollback
-     meanDelay=90.0
-     testDuration=90.0
-
- ; Do NOT kill restore worker process yet
- ; Kill other process to ensure restore works when FDB cluster has faults
-     testName=Attrition
-     machinesToKill=10
-     machinesToLeave=3
-     reboot=true
-     testDuration=90.0
-
-     testName=Attrition
-     machinesToKill=10
-     machinesToLeave=3
-     reboot=true
-     testDuration=90.0
-
- ; Disable buggify for parallel restore
- ;buggify=off
- ;testDuration=360000 ;not work
- ;timeout is in seconds
- timeout=360000
-

versions.target

@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Version>6.2.26</Version>
-    <PackageName>6.2</PackageName>
-  </PropertyGroup>
-</Project>