moving to nunit3

Author: kjnilsson

.gitignore

@@ -20,7 +20,9 @@ TestResult.xml
 rabbit-mock.snk
 test.sh
 *.VisualState.xml
-
+test-output.log
+InternalTrace*
+nunit-agent*
 #################
 ## Visual Studio
 #################

appveyor.yml

@@ -43,5 +43,7 @@ after_build:
 
 artifacts:
   - path: '*.nupkg'
+  - path: '*.log'
+    name: Logs
 
 deploy: off

build.fsx

@@ -58,6 +58,13 @@ let amqpSpec0_9BaseName = "amqp0-9.stripped.xml"
 let amqpSpec0_9_1i = specsDir </> amqpSpec0_9_1BaseName
 let autogeneratedApi0_9_1BaseName = "autogenerated-api-0-9-1.cs"
 
+let setRabbitMqCtlPath () =
+    let current = Environment.GetEnvironmentVariable "RABBITMQ_RABBITMQCTL_PATH" 
+    let ctlPath = __SOURCE_DIRECTORY__ </> "../rabbit/scripts/rabbitmqctl"
+    if current = null then
+        trace <| sprintf "setting RABBITMQ_RABBITMQCTL_PATH to %s" ctlPath
+        Environment.SetEnvironmentVariable("RABBITMQ_RABBITMQCTL_PATH", ctlPath)
+
 let createGensrcDirs () =
     projects
     |> List.map (fun p -> "./gensrc" </> p)
@@ -117,39 +124,43 @@ Target "UpdateAssemblyInfos"
         ReplaceAssemblyInfoVersionsBulk assemblyInfos (fun f -> 
             { f with AssemblyVersion = version }))    
 
-let test excludes =
+let test w =
+    setRabbitMqCtlPath ()
+    //TODO reimplement fixure selection
     let fixture = getBuildParamOrDefault "fixture" ""
     trace <| sprintf "fixture %s" fixture
     !! ("./projects/client/**/build/**/unit-tests.dll")
-    |> NUnit (fun p -> 
+    |> Testing.NUnit3.NUnit3 (fun p ->
         { p with
-            Fixture = fixture
+            Labels = Testing.NUnit3.LabelsLevel.All
+            ProcessModel = Testing.NUnit3.SingleProcessModel
             TimeOut = TimeSpan.FromMinutes 30.
-            ExcludeCategory = excludes
-            DisableShadowCopy = true; 
-            OutputFile = "./TestResults.xml"})
+            Where = w
+            OutputDir = "test-output.log"})
 
 Target "Test" (fun _ ->  
     match buildEnv with
-    | Mono -> "MonoBug"
+    | Mono -> "cat != MonoBug"
     | _ -> "" 
     |> test)
 
 Target "TestQuick" (fun _ ->  
-    let excludes =
+    setRabbitMqCtlPath ()
+    let ``where`` =
         match buildEnv with
-        | Mono -> "RequireSMP,LongRunning,MonoBug"
-        | _ -> "RequireSMP,LongRunning"
+        | Mono -> "cat != RequireSMP & cat != LongRunning & cat != MonoBug"
+        | _ -> "cat != RequireSMP & cat != LongRunning"
     !! ("./projects/client/Unit/build/**/unit-tests.dll")
-    |> NUnit (fun p -> 
+    |> Testing.NUnit3.NUnit3 (fun p -> 
         { p with
+            Labels = Testing.NUnit3.LabelsLevel.All
+            ProcessModel = Testing.NUnit3.SingleProcessModel
             TimeOut = TimeSpan.FromMinutes 30.
-            ExcludeCategory = excludes
-            DisableShadowCopy = true; 
-            OutputFile = "./TestResults.xml"}))
+            Where = ``where``
+            OutputDir = "test-output.log"}))
 
 Target "AppVeyorTest" (fun _ ->  
-    test "RequireSMP,LongRunning,GCTest")
+    test "cat != RequireSMP & cat != LongRunning & cat != GCTest")
 
 Target "CreateGensrcDir" createGensrcDirs