From 2a0510c9f477997e9592d1fe8d2b85632e04aa3a Mon Sep 17 00:00:00 2001
From: Dmitri Smirnov <dmitrism@microsoft.com>
Date: Tue, 17 Nov 2015 11:23:09 -0800
Subject: [PATCH 1/2] Failed tests must be rerun with concurrency 1

---
 build_tools/run_ci_db_test.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_tools/run_ci_db_test.ps1 b/build_tools/run_ci_db_test.ps1
index c646f194e..2e2b679da 100644
--- a/build_tools/run_ci_db_test.ps1
+++ b/build_tools/run_ci_db_test.ps1
@@ -299,7 +299,7 @@ if($Rerun.Count -gt 0) {
     Write-Host "Rerunning " ($Rerun.Count) " tests sequentially"
     $success = $true
     $count = 0
-    RunJobs -TestToLog $Rerun -ConcurrencyVal $Concurrency -AddForRerun $false
+    RunJobs -TestToLog $Rerun -ConcurrencyVal 1 -AddForRerun $false
 }
 
 Get-Date

From 94e39e23645a8ad0a3ff5d547a92429940119c96 Mon Sep 17 00:00:00 2001
From: Dmitri Smirnov <dmitrism@microsoft.com>
Date: Tue, 17 Nov 2015 13:54:13 -0800
Subject: [PATCH 2/2] Exclude DBTest.FileCreationRandomFailure as a long
 running test   Increase concurrency to 18   Fix exclusion but in the ps
 script

---
 appveyor.yml                   | 2 +-
 build_tools/run_ci_db_test.ps1 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 986a82526..4ee3ab417 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,6 +10,6 @@ build:
   verbosity: minimal
 test:
 test_script:
-- ps: build_tools\run_ci_db_test.ps1 -EnableRerun -Run db_test -Exclude DBTest.Randomized -Concurrency 16
+- ps: build_tools\run_ci_db_test.ps1 -EnableRerun -Run db_test -Exclude DBTest.Randomized,DBTest.FileCreationRandomFailure -Concurrency 18
 - ps: build_tools\run_ci_db_test.ps1 -Run env_test -Concurrency 1
 
diff --git a/build_tools/run_ci_db_test.ps1 b/build_tools/run_ci_db_test.ps1
index 2e2b679da..a806f7ea9 100644
--- a/build_tools/run_ci_db_test.ps1
+++ b/build_tools/run_ci_db_test.ps1
@@ -126,7 +126,7 @@ function Normalize-DbTests($HashTable) {
 function MakeAndAdd([string]$token, $HashTable) {
     $test_name = $token -replace '.exe$', ''
     $log_name =  -join ($test_name, ".log")
-    if(!$ExcludeTests.Contains($test)) {
+    if(!$ExcludeTests.Contains($test_name)) {
         $HashTable.Add($test_name, $log_name)
     } else {
         Write-Warning "Test $test_name is excluded"