From 19d47ed5f5352c019ac0d78553d686a7c47913db Mon Sep 17 00:00:00 2001
From: Chris Holt <lefthandedgoat@gmail.com>
Date: Mon, 6 Nov 2017 11:32:15 -0600
Subject: [PATCH 01/13] Fix build warning for reporters

---
 src/canopy/reporters.fs | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/canopy/reporters.fs b/src/canopy/reporters.fs
index 46f74d1a..171a2890 100644
--- a/src/canopy/reporters.fs
+++ b/src/canopy/reporters.fs
@@ -183,7 +183,7 @@ type TeamCityReporter(?logImagesToConsole: bool) =
 
         member this.setEnvironment env = ()
 
-type LiveHtmlReporter(browser : BrowserStartMode, driverPath : string, ?pinBrowserRight0: bool) =    
+type LiveHtmlReporter(browser : BrowserStartMode, driverPath : string, ?pinBrowserRight0: bool) =
     let pinBrowserRight = defaultArg pinBrowserRight0 true
     let consoleReporter : IReporter = new ConsoleReporter() :> IReporter
 
@@ -198,27 +198,38 @@ type LiveHtmlReporter(browser : BrowserStartMode, driverPath : string, ?pinBrows
                 let options = Chrome.ChromeOptions()
                 options.AddArguments("--disable-extensions")
                 options.AddArgument("disable-infobars")
-                options.AddArgument("test-type") //https://code.google.com/p/chromedriver/issues/detail?id=799                
+                options.AddArgument("test-type") //https://code.google.com/p/chromedriver/issues/detail?id=799
                 new Chrome.ChromeDriver(driverPath, options) :> IWebDriver
+        | ChromeHeadless ->
+            let options = Chrome.ChromeOptions()
+            options.AddArgument("--disable-extensions")
+            options.AddArgument("disable-infobars")
+            options.AddArgument("test-type") //https://code.google.com/p/chromedriver/issues/detail?id=799
+            options.AddArgument("--headless")
+            new Chrome.ChromeDriver(driverPath, options) :> IWebDriver
         | ChromeWithOptions options -> new Chrome.ChromeDriver(driverPath, options) :> IWebDriver
         | ChromeWithOptionsAndTimeSpan(options, timeSpan) -> new Chrome.ChromeDriver(driverPath, options, timeSpan) :> IWebDriver
         | ChromeWithUserAgent userAgent -> raise(System.Exception("Sorry ChromeWithUserAgent can't be used for LiveHtmlReporter"))
         | ChromiumWithOptions options -> new Chrome.ChromeDriver(driverPath, options) :> IWebDriver
         | Firefox -> new Firefox.FirefoxDriver() :> IWebDriver
         | FirefoxWithProfile profile -> new Firefox.FirefoxDriver(profile) :> IWebDriver
-        | FirefoxWithPath path -> 
+        | FirefoxWithPath path ->
           let options = new Firefox.FirefoxOptions()
           options.BrowserExecutableLocation <- path
           new Firefox.FirefoxDriver(options) :> IWebDriver
         | FirefoxWithUserAgent userAgent -> raise(System.Exception("Sorry FirefoxWithUserAgent can't be used for LiveHtmlReporter"))
-        | FirefoxWithPathAndTimeSpan(path, timespan) -> 
+        | FirefoxWithPathAndTimeSpan(path, timespan) ->
           let options = new Firefox.FirefoxOptions()
           options.BrowserExecutableLocation <- path
           new Firefox.FirefoxDriver(Firefox.FirefoxDriverService.CreateDefaultService(), options, timespan) :> IWebDriver
-        | FirefoxWithProfileAndTimeSpan(profile, timespan) -> 
+        | FirefoxWithProfileAndTimeSpan(profile, timespan) ->
           let options = new Firefox.FirefoxOptions()
           options.Profile <- profile
           new Firefox.FirefoxDriver(Firefox.FirefoxDriverService.CreateDefaultService(), options, timespan) :> IWebDriver
+        | FirefoxHeadless ->
+            let options = new Firefox.FirefoxOptions()
+            options.AddArgument("--headless")
+            new Firefox.FirefoxDriver(options) :> IWebDriver
         | Safari -> new Safari.SafariDriver() :> IWebDriver
         | PhantomJS | PhantomJSProxyNone -> raise(System.Exception("Sorry PhantomJS can't be used for LiveHtmlReporter"))
         | Remote(_,_) -> raise(System.Exception("Sorry Remote can't be used for LiveHtmlReporter"))

From 5e8ef8a5afffecdca2cbd1faf9f6a6c48961d06f Mon Sep 17 00:00:00 2001
From: Chris Holt <lefthandedgoat@gmail.com>
Date: Mon, 6 Nov 2017 12:02:32 -0600
Subject: [PATCH 02/13] Add basics for a load testing tool

---
 .../canopy.integration.fsproj                 |   5 +-
 src/canopy.integration/csharp.fs              |   6 +-
 src/canopy.integration/loadTest.fs            | 109 ++++++++++++++++++
 tests/basictests/Program.fs                   |  14 ++-
 tests/basictests/basictests.fsproj            |   7 +-
 tests/basictests/file1.fs                     |   8 +-
 tests/basictests/file2.fs                     |   8 +-
 tests/basictests/loadTestTests.fs             |  10 ++
 8 files changed, 145 insertions(+), 22 deletions(-)
 create mode 100644 src/canopy.integration/loadTest.fs
 create mode 100644 tests/basictests/loadTestTests.fs

diff --git a/src/canopy.integration/canopy.integration.fsproj b/src/canopy.integration/canopy.integration.fsproj
index bd79a10f..4ecc19ab 100644
--- a/src/canopy.integration/canopy.integration.fsproj
+++ b/src/canopy.integration/canopy.integration.fsproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -52,6 +52,7 @@
     <Compile Include="AssemblyInfo.fs" />
     <None Include="paket.references" />
     <Compile Include="jsonValidator.fs" />
+    <Compile Include="loadTest.fs" />
     <Compile Include="csharp.fs" />
   </ItemGroup>
   <ItemGroup>
@@ -96,4 +97,4 @@
       </ItemGroup>
     </When>
   </Choose>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/canopy.integration/csharp.fs b/src/canopy.integration/csharp.fs
index 032cd155..7eeae851 100644
--- a/src/canopy.integration/csharp.fs
+++ b/src/canopy.integration/csharp.fs
@@ -2,11 +2,11 @@
 
 
 
-type integration () =    
+type integration () =
 
-    static member diffJson example actual = 
+    static member diffJson example actual =
         let diff = jsonValidator.diff example actual
         let diffString = diff |> List.map (fun d -> match d with | jsonValidator.Missing s -> sprintf "Missing %s" s | jsonValidator.Extra s -> sprintf "Extra %s" s)
         ResizeArray<string>(diffString)
 
-    static member validateJson example actual = jsonValidator.validate example actual
\ No newline at end of file
+    static member validateJson example actual = jsonValidator.validate example actual
diff --git a/src/canopy.integration/loadTest.fs b/src/canopy.integration/loadTest.fs
new file mode 100644
index 00000000..b660735d
--- /dev/null
+++ b/src/canopy.integration/loadTest.fs
@@ -0,0 +1,109 @@
+module loadTest
+
+open System
+
+let guid guid = System.Guid.Parse(guid)
+
+type SendFormData =
+  {
+    JobId : string
+    NumberOfRequests : string
+    MaxWorkers : string
+    Uri : string
+  }
+
+type SendData =
+  {
+    JobId : System.Guid
+    NumberOfRequests : int
+    MaxWorkers : int
+    Uri : string
+  }
+
+let convertSendData (sendFormData : SendFormData) =
+  {
+    JobId = guid sendFormData.JobId
+    NumberOfRequests = int sendFormData.NumberOfRequests
+    MaxWorkers = int sendFormData.MaxWorkers
+    Uri = sendFormData.Uri
+  }
+
+//actor stuff
+type actor<'t> = MailboxProcessor<'t>
+
+type Command =
+  | Process of (unit -> float)
+
+type Worker =
+  | Do
+  | Retire
+
+type Manager =
+  | Initialize of SendData * Command
+  | WorkerDone of float * actor<Worker>
+
+let time f =
+  //just time it and swallow any exceptions for now
+  let stopWatch = System.Diagnostics.Stopwatch.StartNew()
+  try f() |> ignore
+  with _ -> ()
+  stopWatch.Elapsed.TotalMilliseconds
+
+let newWorker (manager : actor<Manager>) (command : Command): actor<Worker> =
+  actor.Start(fun self ->
+    let rec loop () =
+      async {
+        let! msg = self.Receive ()
+        match msg with
+        | Worker.Retire ->
+          return ()
+        | Worker.Do ->
+          match command with
+          | Process f ->
+            let timing = time f
+            manager.Post(Manager.WorkerDone(timing, self))
+          return! loop ()
+      }
+    loop ())
+
+let rec haveWorkersWork (idleWorkers : actor<Worker> list) numberOfRequests =
+    match idleWorkers with
+    | [] -> numberOfRequests
+    | worker :: remainingWorkers ->
+      worker.Post(Worker.Do)
+      haveWorkersWork remainingWorkers (numberOfRequests - 1)
+
+let newManager () : actor<Manager> =
+  let sw = System.Diagnostics.Stopwatch()
+  actor.Start(fun self ->
+    let rec loop numberOfRequests pendingRequests results =
+      async {
+        let! msg = self.Receive ()
+        match msg with
+        | Manager.Initialize (sendData, command) ->
+          //build up a list of all the work to do
+          printfn "Requests: %A, Concurrency %A" sendData.NumberOfRequests sendData.MaxWorkers
+          let numberOfRequests = sendData.NumberOfRequests
+          let workers = [ 1 .. sendData.MaxWorkers ] |> List.map (fun _ -> newWorker self command)
+          let results = []
+          let pendingRequests = sendData.MaxWorkers
+          sw.Restart()
+          let numberOfRequests = haveWorkersWork workers numberOfRequests
+          return! loop numberOfRequests pendingRequests results
+        | Manager.WorkerDone(ms, worker) ->
+          let results = ms :: results
+          if numberOfRequests > 0 then
+            let numberOfRequests = haveWorkersWork [worker] numberOfRequests
+            return! loop numberOfRequests pendingRequests results
+          else if pendingRequests > 1 then //if only 1 pendingRequest, then this that pendingRequest so we are done
+            let pendingRequests = pendingRequests - 1
+            return! loop numberOfRequests pendingRequests results
+          else
+            sw.Stop()
+            let avg = results |> List.average
+            let min = results |> List.min
+            let max = results |> List.max
+            printfn "Total seconds: %A, Average ms: %A, Max ms: %A, Min ms: %A" sw.Elapsed.TotalSeconds avg max min
+            return! loop numberOfRequests pendingRequests results
+      }
+    loop 0 0 [])
diff --git a/tests/basictests/Program.fs b/tests/basictests/Program.fs
index dc6878ef..bd30a5dd 100644
--- a/tests/basictests/Program.fs
+++ b/tests/basictests/Program.fs
@@ -5,14 +5,14 @@ open OpenQA.Selenium
 open canopy
 open reporters
 
-start chrome
+//start chrome
 let mainBrowser = browser
 elementTimeout <- 3.0
 compareTimeout <- 3.0
 pageTimeout <- 3.0
 runFailedContextsFirst <- false
-reporter <- new LiveHtmlReporter(Chrome, configuration.chromeDir) :> IReporter
-reporter.setEnvironment "My Machine"
+//reporter <- new LiveHtmlReporter(Chrome, configuration.chromeDir) :> IReporter
+//reporter.setEnvironment "My Machine"
 configuration.failureMessagesThatShoulBeTreatedAsSkip <- ["Skip me when I fail"]
 
 configuration.failScreenshotFileName <-
@@ -22,12 +22,14 @@ configuration.failScreenshotFileName <-
       let stamp = DateTime.Now.ToString("MMM-d_HH-mm-ss")
       sprintf "%s_%s_%s" suiteContext cleanName stamp)
 
-failFast := true
+failFast := false
+
+loadTestTests.all()
 
 jsonValidatorTests.all()
 
-file1.all()
-file2.all()
+//file1.all()
+//file2.all()
 
 context "context1"
 once (fun _ -> Console.WriteLine "once")
diff --git a/tests/basictests/basictests.fsproj b/tests/basictests/basictests.fsproj
index 5084c9f6..e32af96d 100644
--- a/tests/basictests/basictests.fsproj
+++ b/tests/basictests/basictests.fsproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -54,6 +54,7 @@
   <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
   <ItemGroup>
     <Compile Include="jsonValidatorTests.fs" />
+    <Compile Include="loadTestTests.fs" />
     <Compile Include="file1.fs" />
     <Compile Include="file2.fs" />
     <Compile Include="Program.fs" />
@@ -82,7 +83,7 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
 	     Other similar extension points exist, see Microsoft.Common.targets.
 	<Target Name="BeforeBuild">
 	</Target>
@@ -112,4 +113,4 @@
       </ItemGroup>
     </When>
   </Choose>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/basictests/file1.fs b/tests/basictests/file1.fs
index 1908ee47..e7e996e0 100644
--- a/tests/basictests/file1.fs
+++ b/tests/basictests/file1.fs
@@ -3,15 +3,15 @@ module file1
 open canopy
 open runner
 
-let testpage = "http://lefthandedgoat.github.io/canopy/testpages/" 
+let testpage = "http://lefthandedgoat.github.io/canopy/testpages/"
 
 let all() =
     context "file1"
 
-    "from file 1 2" &&& fun _ ->    
+    "from file 1 2" &&& fun _ ->
         url testpage
         "#welcome" == "Welcome"
 
-    "from file 1 2" &&& fun _ ->    
+    "from file 1 2" &&& fun _ ->
         url testpage
-        "#welcome" == "Welcome"
\ No newline at end of file
+        "#welcome" == "Welcome"
diff --git a/tests/basictests/file2.fs b/tests/basictests/file2.fs
index 57ed8c05..b5b5da0e 100644
--- a/tests/basictests/file2.fs
+++ b/tests/basictests/file2.fs
@@ -3,15 +3,15 @@ module file2
 open canopy
 open runner
 
-let testpage = "http://lefthandedgoat.github.io/canopy/testpages/" 
+let testpage = "http://lefthandedgoat.github.io/canopy/testpages/"
 
 let all() =
     context "file2"
 
-    "from file 2 1" &&&&& fun _ ->    
+    "from file 2 1" &&&&& fun _ ->
         url testpage
         "#welcome" == "Welcome"
 
-    "from file 2 2" &&&&& fun _ ->    
+    "from file 2 2" &&&&& fun _ ->
         url testpage
-        "#welcome" == "Welcome"
\ No newline at end of file
+        "#welcome" == "Welcome"
diff --git a/tests/basictests/loadTestTests.fs b/tests/basictests/loadTestTests.fs
new file mode 100644
index 00000000..d6b2066b
--- /dev/null
+++ b/tests/basictests/loadTestTests.fs
@@ -0,0 +1,10 @@
+module loadTestTests
+
+open canopy.runner
+
+let all () =
+    context "tests for the load tester in integration"
+
+    "blah" &&&& fun _ ->
+        printfn "cry"
+        ()

From c51012d12283acb22f911392b02526f71a00df96 Mon Sep 17 00:00:00 2001
From: Chris Holt <lefthandedgoat@gmail.com>
Date: Mon, 6 Nov 2017 12:25:40 -0600
Subject: [PATCH 03/13] more load testing goodness

---
 src/canopy.integration/loadTest.fs | 53 ++++++++++++++++++++++--------
 tests/basictests/loadTestTests.fs  | 23 +++++++++++--
 2 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/src/canopy.integration/loadTest.fs b/src/canopy.integration/loadTest.fs
index b660735d..ca597a7f 100644
--- a/src/canopy.integration/loadTest.fs
+++ b/src/canopy.integration/loadTest.fs
@@ -4,12 +4,25 @@ open System
 
 let guid guid = System.Guid.Parse(guid)
 
-type SendFormData =
+type Timescale =
+  | Seconds
+  | Minutes
+
+type Task =
   {
-    JobId : string
-    NumberOfRequests : string
-    MaxWorkers : string
-    Uri : string
+    Description : string
+    Action : (unit -> unit)
+    Frequency : int
+  }
+
+type Job =
+  {
+    Timescale : Timescale
+    Warmup : bool
+    Baseline : bool
+    AcceptableRatioPercent : int
+    Iterations : int
+    Tasks : Task list
   }
 
 type SendData =
@@ -20,14 +33,6 @@ type SendData =
     Uri : string
   }
 
-let convertSendData (sendFormData : SendFormData) =
-  {
-    JobId = guid sendFormData.JobId
-    NumberOfRequests = int sendFormData.NumberOfRequests
-    MaxWorkers = int sendFormData.MaxWorkers
-    Uri = sendFormData.Uri
-  }
-
 //actor stuff
 type actor<'t> = MailboxProcessor<'t>
 
@@ -107,3 +112,25 @@ let newManager () : actor<Manager> =
             return! loop numberOfRequests pendingRequests results
       }
     loop 0 0 [])
+
+let runLoadTest job =
+  //validate that all the descriptions are unique
+
+  //create warmup workers if need be and run them 1 after the other
+
+  //create baseline workers and run them 1 after the other and record values
+
+  //create all the workers and create the time they should execute
+  //loop and look at head and see if its time has passed and if it has then
+    //run it and pass tail
+    //recurse
+    //finish when manager says that there are no more workers
+
+  //workers report to reporter that they are done and maybe the manager
+
+
+  //if baselined validate times against baseline and fail if off
+    //map diffs and print them
+  //else
+    //print averages
+  ()
diff --git a/tests/basictests/loadTestTests.fs b/tests/basictests/loadTestTests.fs
index d6b2066b..296ffb8b 100644
--- a/tests/basictests/loadTestTests.fs
+++ b/tests/basictests/loadTestTests.fs
@@ -1,10 +1,27 @@
 module loadTestTests
 
 open canopy.runner
+open loadTest
 
 let all () =
     context "tests for the load tester in integration"
 
-    "blah" &&&& fun _ ->
-        printfn "cry"
-        ()
+    "can create a basic job" &&&& fun _ ->
+        let job =
+          {
+            Timescale = Minutes
+            Warmup = true
+            Baseline = true
+            AcceptableRatioPercent = 200
+            Iterations = 2
+            Tasks =
+              [
+                {
+                  Description = "print hello world"
+                  Action = fun _ -> printf "hello world"
+                  Frequency = 1
+                }
+              ]
+          }
+
+        runLoadTest job

From be4da46e2ff1c0d6fcf45685a7dd2122ef0dd406 Mon Sep 17 00:00:00 2001
From: Chris Holt <lefthandedgoat@gmail.com>
Date: Mon, 6 Nov 2017 14:31:53 -0600
Subject: [PATCH 04/13] load test - duplicate check and warmup done

---
 src/canopy.integration/loadTest.fs | 76 ++++++++++++++++++++++--------
 1 file changed, 56 insertions(+), 20 deletions(-)

diff --git a/src/canopy.integration/loadTest.fs b/src/canopy.integration/loadTest.fs
index ca597a7f..ae21302b 100644
--- a/src/canopy.integration/loadTest.fs
+++ b/src/canopy.integration/loadTest.fs
@@ -36,16 +36,17 @@ type SendData =
 //actor stuff
 type actor<'t> = MailboxProcessor<'t>
 
-type Command =
-  | Process of (unit -> float)
-
 type Worker =
   | Do
   | Retire
 
+type Reporter =
+  | WorkerDone of description:string * timing:float
+  | Retire
+
 type Manager =
-  | Initialize of SendData * Command
   | WorkerDone of float * actor<Worker>
+  | Retire
 
 let time f =
   //just time it and swallow any exceptions for now
@@ -54,7 +55,7 @@ let time f =
   with _ -> ()
   stopWatch.Elapsed.TotalMilliseconds
 
-let newWorker (manager : actor<Manager>) (command : Command): actor<Worker> =
+let newWorker (manager : actor<Manager>) (reporter : actor<Reporter>) description action : actor<Worker> =
   actor.Start(fun self ->
     let rec loop () =
       async {
@@ -63,10 +64,25 @@ let newWorker (manager : actor<Manager>) (command : Command): actor<Worker> =
         | Worker.Retire ->
           return ()
         | Worker.Do ->
-          match command with
-          | Process f ->
-            let timing = time f
-            manager.Post(Manager.WorkerDone(timing, self))
+          let timing = time action
+          reporter.Post(Reporter.WorkerDone(description, timing))
+          manager.Post(Manager.WorkerDone(timing, self))
+          return! loop ()
+      }
+    loop ())
+
+let newReporter () : actor<Reporter> =
+  let mutable results : (string * float) list = []
+  actor.Start(fun self ->
+    let rec loop () =
+      async {
+        let! msg = self.Receive ()
+        match msg with
+        | Reporter.Retire ->
+          //do some calculations and return them?
+          return ()
+        | Reporter.WorkerDone (description, timing) ->
+          results <- (description, timing) :: results
           return! loop ()
       }
     loop ())
@@ -85,16 +101,8 @@ let newManager () : actor<Manager> =
       async {
         let! msg = self.Receive ()
         match msg with
-        | Manager.Initialize (sendData, command) ->
-          //build up a list of all the work to do
-          printfn "Requests: %A, Concurrency %A" sendData.NumberOfRequests sendData.MaxWorkers
-          let numberOfRequests = sendData.NumberOfRequests
-          let workers = [ 1 .. sendData.MaxWorkers ] |> List.map (fun _ -> newWorker self command)
-          let results = []
-          let pendingRequests = sendData.MaxWorkers
-          sw.Restart()
-          let numberOfRequests = haveWorkersWork workers numberOfRequests
-          return! loop numberOfRequests pendingRequests results
+        | Manager.Retire ->
+          return ()
         | Manager.WorkerDone(ms, worker) ->
           let results = ms :: results
           if numberOfRequests > 0 then
@@ -113,11 +121,38 @@ let newManager () : actor<Manager> =
       }
     loop 0 0 [])
 
+let private failIfDuplicateTasks job =
+  let duplicates =
+    job.Tasks
+    |> Seq.groupBy (fun task -> task.Description)
+    |> Seq.filter (fun (description, tasks) -> Seq.length tasks > 1)
+    |> Seq.map (fun (description, _) -> description)
+    |> List.ofSeq
+
+  if duplicates <> [] then failwith <| sprintf "You have tasks with duplicates decriptions: %A" duplicates
+
+let private warmup job =
+  let manager = newManager ()
+  let reporter = newReporter ()
+
+  job.Tasks
+  |> List.map (fun task -> newWorker manager reporter task.Description task.Action)
+  |> List.iter (fun worker -> worker.Post(Do); worker.Post(Worker.Retire))
+
+  reporter.Post(Reporter.Retire)
+  manager.Post(Manager.Retire)
+
+
 let runLoadTest job =
-  //validate that all the descriptions are unique
+  let reporter = newReporter ()
+
+  //make sure that we dont have duplicate descriptions because it will mess up the numbers
+  failIfDuplicateTasks job
 
   //create warmup workers if need be and run them 1 after the other
+  if job.Warmup = true then warmup job
 
+  //if job.Baseline = true then warmup job
   //create baseline workers and run them 1 after the other and record values
 
   //create all the workers and create the time they should execute
@@ -133,4 +168,5 @@ let runLoadTest job =
     //map diffs and print them
   //else
     //print averages
+
   ()

From cdb0a6dd49ccc69b994ca01489c4c6234c08d18e Mon Sep 17 00:00:00 2001
From: Chris Holt <lefthandedgoat@gmail.com>
Date: Mon, 6 Nov 2017 15:25:32 -0600
Subject: [PATCH 05/13] load test - wait for all workers to finish before
 retiring

---
 src/canopy.integration/loadTest.fs | 48 ++++++++++++------------------
 tests/basictests/loadTestTests.fs  |  2 +-
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/src/canopy.integration/loadTest.fs b/src/canopy.integration/loadTest.fs
index ae21302b..ae98b6df 100644
--- a/src/canopy.integration/loadTest.fs
+++ b/src/canopy.integration/loadTest.fs
@@ -45,8 +45,9 @@ type Reporter =
   | Retire
 
 type Manager =
-  | WorkerDone of float * actor<Worker>
-  | Retire
+  | Initialize of workerCount:int
+  | WorkerDone
+  | Retire of AsyncReplyChannel<bool>
 
 let time f =
   //just time it and swallow any exceptions for now
@@ -66,7 +67,7 @@ let newWorker (manager : actor<Manager>) (reporter : actor<Reporter>) descriptio
         | Worker.Do ->
           let timing = time action
           reporter.Post(Reporter.WorkerDone(description, timing))
-          manager.Post(Manager.WorkerDone(timing, self))
+          manager.Post(Manager.WorkerDone)
           return! loop ()
       }
     loop ())
@@ -87,39 +88,26 @@ let newReporter () : actor<Reporter> =
       }
     loop ())
 
-let rec haveWorkersWork (idleWorkers : actor<Worker> list) numberOfRequests =
-    match idleWorkers with
-    | [] -> numberOfRequests
-    | worker :: remainingWorkers ->
-      worker.Post(Worker.Do)
-      haveWorkersWork remainingWorkers (numberOfRequests - 1)
-
 let newManager () : actor<Manager> =
   let sw = System.Diagnostics.Stopwatch()
   actor.Start(fun self ->
-    let rec loop numberOfRequests pendingRequests results =
+    let rec loop workerCount =
       async {
         let! msg = self.Receive ()
         match msg with
-        | Manager.Retire ->
-          return ()
-        | Manager.WorkerDone(ms, worker) ->
-          let results = ms :: results
-          if numberOfRequests > 0 then
-            let numberOfRequests = haveWorkersWork [worker] numberOfRequests
-            return! loop numberOfRequests pendingRequests results
-          else if pendingRequests > 1 then //if only 1 pendingRequest, then this that pendingRequest so we are done
-            let pendingRequests = pendingRequests - 1
-            return! loop numberOfRequests pendingRequests results
+        | Manager.Retire replyChannel ->
+          if workerCount = 0 then
+            replyChannel.Reply(true)
+            return ()
           else
-            sw.Stop()
-            let avg = results |> List.average
-            let min = results |> List.min
-            let max = results |> List.max
-            printfn "Total seconds: %A, Average ms: %A, Max ms: %A, Min ms: %A" sw.Elapsed.TotalSeconds avg max min
-            return! loop numberOfRequests pendingRequests results
+            self.Post(Manager.Retire replyChannel)
+            return! loop workerCount
+        | Manager.Initialize workerCount ->
+          return! loop workerCount
+        | Manager.WorkerDone ->
+          return! loop (workerCount - 1)
       }
-    loop 0 0 [])
+    loop 0)
 
 let private failIfDuplicateTasks job =
   let duplicates =
@@ -135,12 +123,14 @@ let private warmup job =
   let manager = newManager ()
   let reporter = newReporter ()
 
+  manager.Post(Initialize(job.Tasks.Length))
+
   job.Tasks
   |> List.map (fun task -> newWorker manager reporter task.Description task.Action)
   |> List.iter (fun worker -> worker.Post(Do); worker.Post(Worker.Retire))
 
+  manager.PostAndReply(fun replyChannel -> Manager.Retire replyChannel) |> ignore
   reporter.Post(Reporter.Retire)
-  manager.Post(Manager.Retire)
 
 
 let runLoadTest job =
diff --git a/tests/basictests/loadTestTests.fs b/tests/basictests/loadTestTests.fs
index 296ffb8b..54765ff3 100644
--- a/tests/basictests/loadTestTests.fs
+++ b/tests/basictests/loadTestTests.fs
@@ -18,7 +18,7 @@ let all () =
               [
                 {
                   Description = "print hello world"
-                  Action = fun _ -> printf "hello world"
+                  Action = fun _ -> printfn "hello world"
                   Frequency = 1
                 }
               ]

From ed72c945be74a11387308edb185af4c4f23dda5b Mon Sep 17 00:00:00 2001
From: Chris Holt <lefthandedgoat@gmail.com>
Date: Mon, 6 Nov 2017 15:45:17 -0600
Subject: [PATCH 06/13] load test - added baseline

---
 src/canopy.integration/loadTest.fs | 44 ++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/canopy.integration/loadTest.fs b/src/canopy.integration/loadTest.fs
index ae98b6df..8f02012a 100644
--- a/src/canopy.integration/loadTest.fs
+++ b/src/canopy.integration/loadTest.fs
@@ -25,12 +25,13 @@ type Job =
     Tasks : Task list
   }
 
-type SendData =
+type Result =
   {
-    JobId : System.Guid
-    NumberOfRequests : int
-    MaxWorkers : int
-    Uri : string
+    Description : string
+    Min : float
+    Max : float
+    Average: float
+    //Todo maybe add 95% and 99%
   }
 
 //actor stuff
@@ -42,7 +43,7 @@ type Worker =
 
 type Reporter =
   | WorkerDone of description:string * timing:float
-  | Retire
+  | Retire of AsyncReplyChannel<Result list>
 
 type Manager =
   | Initialize of workerCount:int
@@ -79,8 +80,21 @@ let newReporter () : actor<Reporter> =
       async {
         let! msg = self.Receive ()
         match msg with
-        | Reporter.Retire ->
-          //do some calculations and return them?
+        | Reporter.Retire replyChannel ->
+          let finalResults =
+            results
+            |> Seq.groupBy (fun (description, timing) -> description)
+            |> Seq.map (fun (description, pairs) -> description, pairs |> Seq.map (fun (_, timings) -> timings))
+            |> Seq.map (fun (description, timings) ->
+                 {
+                   Description = description
+                   Min = Seq.min timings
+                   Max = Seq.max timings
+                   Average = Seq.average timings
+                 }
+               )
+             |> List.ofSeq
+          replyChannel.Reply(finalResults)
           return ()
         | Reporter.WorkerDone (description, timing) ->
           results <- (description, timing) :: results
@@ -119,7 +133,7 @@ let private failIfDuplicateTasks job =
 
   if duplicates <> [] then failwith <| sprintf "You have tasks with duplicates decriptions: %A" duplicates
 
-let private warmup job =
+let private runTasksOnce job =
   let manager = newManager ()
   let reporter = newReporter ()
 
@@ -130,11 +144,19 @@ let private warmup job =
   |> List.iter (fun worker -> worker.Post(Do); worker.Post(Worker.Retire))
 
   manager.PostAndReply(fun replyChannel -> Manager.Retire replyChannel) |> ignore
-  reporter.Post(Reporter.Retire)
+  reporter.PostAndReply(fun replyChannel -> Reporter.Retire replyChannel)
+
+let private baseline job =
+  let results = runTasksOnce job
+  results |> List.iter (printfn "%A")
+  results
 
+//warmup and baseline are the same but you ignore the results of warmup
+let private warmup job = runTasksOnce job |> ignore
 
 let runLoadTest job =
   let reporter = newReporter ()
+  let mutable baselineResults : Result list = []
 
   //make sure that we dont have duplicate descriptions because it will mess up the numbers
   failIfDuplicateTasks job
@@ -142,7 +164,7 @@ let runLoadTest job =
   //create warmup workers if need be and run them 1 after the other
   if job.Warmup = true then warmup job
 
-  //if job.Baseline = true then warmup job
+  if job.Baseline = true then baselineResults <- baseline job
   //create baseline workers and run them 1 after the other and record values
 
   //create all the workers and create the time they should execute

From 08a68cd44ca4cadee6c73cf9a0518b02c17ddfe8 Mon Sep 17 00:00:00 2001
From: Chris Holt <lefthandedgoat@gmail.com>
Date: Mon, 6 Nov 2017 17:36:49 -0600
Subject: [PATCH 07/13] load test - timeline created and iterator created

---
 src/canopy.integration/loadTest.fs | 48 +++++++++++++++++++++++-------
 tests/basictests/loadTestTests.fs  | 25 ++++++++++++++--
 2 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/src/canopy.integration/loadTest.fs b/src/canopy.integration/loadTest.fs
index 8f02012a..4b601015 100644
--- a/src/canopy.integration/loadTest.fs
+++ b/src/canopy.integration/loadTest.fs
@@ -4,10 +4,6 @@ open System
 
 let guid guid = System.Guid.Parse(guid)
 
-type Timescale =
-  | Seconds
-  | Minutes
-
 type Task =
   {
     Description : string
@@ -17,7 +13,6 @@ type Task =
 
 type Job =
   {
-    Timescale : Timescale
     Warmup : bool
     Baseline : bool
     AcceptableRatioPercent : int
@@ -154,7 +149,36 @@ let private baseline job =
 //warmup and baseline are the same but you ignore the results of warmup
 let private warmup job = runTasksOnce job |> ignore
 
+let createTimeline job =
+  let random = System.Random(1) //always seed to 1 so we get the same pattern
+
+  [0 .. job.Iterations - 1]
+  |> List.map (fun i ->
+       job.Tasks
+         |> List.map (fun task ->
+         //find a random time to wait before running the first iteration
+         //for a Frequency of 1 its random between 0 and 60
+         //for a Frequencey of 12 its random between 0 and 5
+         let maxRandom = 60000 / task.Frequency //ms
+         let startPoint = random.Next(0, maxRandom)
+         [0 .. task.Frequency - 1] |> List.map (fun j -> startPoint + (maxRandom * j) + (60000 * i), task))
+       |> List.concat)
+     |> List.concat
+     |> List.sortBy (fun (timing, _) -> timing)
+
+let rec private iterateWorkers timingsAndWorkers (sw : System.Diagnostics.Stopwatch) =
+  match timingsAndWorkers with
+  | [] -> ()
+  | (timing, worker : actor<Worker>) :: tail ->
+    if int sw.Elapsed.TotalMilliseconds > timing then
+      worker.Post(Worker.Do)
+      iterateWorkers tail sw
+    else
+      System.Threading.Thread.Sleep(1)
+      iterateWorkers timingsAndWorkers sw
+
 let runLoadTest job =
+  let manager = newManager ()
   let reporter = newReporter ()
   let mutable baselineResults : Result list = []
 
@@ -164,18 +188,20 @@ let runLoadTest job =
   //create warmup workers if need be and run them 1 after the other
   if job.Warmup = true then warmup job
 
-  if job.Baseline = true then baselineResults <- baseline job
   //create baseline workers and run them 1 after the other and record values
+  if job.Baseline = true then baselineResults <- baseline job
 
   //create all the workers and create the time they should execute
-  //loop and look at head and see if its time has passed and if it has then
-    //run it and pass tail
-    //recurse
-    //finish when manager says that there are no more workers
+  let timingsAndWorkers = createTimeline job |> List.map (fun (timing, task) -> timing, newWorker manager reporter task.Description task.Action)
+  manager.Post(Initialize(timingsAndWorkers.Length))
 
-  //workers report to reporter that they are done and maybe the manager
+  //loop and look at head and see if its time has passed and if it has then
+  iterateWorkers timingsAndWorkers (System.Diagnostics.Stopwatch.StartNew())
 
+  manager.PostAndReply(fun replyChannel -> Manager.Retire replyChannel) |> ignore
+  let results = reporter.PostAndReply(fun replyChannel -> Reporter.Retire replyChannel)
 
+  printfn "%A" results
   //if baselined validate times against baseline and fail if off
     //map diffs and print them
   //else
diff --git a/tests/basictests/loadTestTests.fs b/tests/basictests/loadTestTests.fs
index 54765ff3..c3135463 100644
--- a/tests/basictests/loadTestTests.fs
+++ b/tests/basictests/loadTestTests.fs
@@ -9,19 +9,38 @@ let all () =
     "can create a basic job" &&&& fun _ ->
         let job =
           {
-            Timescale = Minutes
             Warmup = true
             Baseline = true
             AcceptableRatioPercent = 200
-            Iterations = 2
+            Iterations = 1
             Tasks =
               [
                 {
                   Description = "print hello world"
                   Action = fun _ -> printfn "hello world"
-                  Frequency = 1
+                  Frequency = 60
                 }
               ]
           }
 
         runLoadTest job
+
+    "timelines look reasonable" &&! fun _ ->
+        let job =
+          {
+            Warmup = true
+            Baseline = true
+            AcceptableRatioPercent = 200
+            Iterations = 1
+            Tasks =
+              [
+                {
+                  Description = "print hello world"
+                  Action = fun _ -> printfn "hello world"
+                  Frequency = 4
+                }
+              ]
+          }
+
+        createTimeline job
+        |> List.iter (fun (timing, task) -> printfn "%A %A" timing task.Description)

From ef2179b901a61d81787670234116cc268d1d9270 Mon Sep 17 00:00:00 2001
From: Chris Holt <lefthandedgoat@gmail.com>
Date: Tue, 7 Nov 2017 10:22:06 -0600
Subject: [PATCH 08/13] load test - change iterations to minutes to be more
 clear, and introduce the ability to scale up the load

---
 src/canopy.integration/loadTest.fs | 11 +++++++----
 tests/basictests/loadTestTests.fs  | 17 ++++++++++++-----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/canopy.integration/loadTest.fs b/src/canopy.integration/loadTest.fs
index 4b601015..81389d21 100644
--- a/src/canopy.integration/loadTest.fs
+++ b/src/canopy.integration/loadTest.fs
@@ -16,7 +16,8 @@ type Job =
     Warmup : bool
     Baseline : bool
     AcceptableRatioPercent : int
-    Iterations : int
+    Minutes : int
+    Load : int
     Tasks : Task list
   }
 
@@ -109,6 +110,7 @@ let newManager () : actor<Manager> =
             replyChannel.Reply(true)
             return ()
           else
+            System.Threading.Thread.Sleep(10)
             self.Post(Manager.Retire replyChannel)
             return! loop workerCount
         | Manager.Initialize workerCount ->
@@ -152,16 +154,17 @@ let private warmup job = runTasksOnce job |> ignore
 let createTimeline job =
   let random = System.Random(1) //always seed to 1 so we get the same pattern
 
-  [0 .. job.Iterations - 1]
+  [0 .. job.Minutes - 1]
   |> List.map (fun i ->
        job.Tasks
          |> List.map (fun task ->
          //find a random time to wait before running the first iteration
          //for a Frequency of 1 its random between 0 and 60
          //for a Frequencey of 12 its random between 0 and 5
-         let maxRandom = 60000 / task.Frequency //ms
+         //multiply by load to increase frequency
+         let maxRandom = 60000 / (task.Frequency * job.Load) //ms
          let startPoint = random.Next(0, maxRandom)
-         [0 .. task.Frequency - 1] |> List.map (fun j -> startPoint + (maxRandom * j) + (60000 * i), task))
+         [0 .. (task.Frequency * job.Load) - 1] |> List.map (fun j -> startPoint + (maxRandom * j) + (60000 * i), task))
        |> List.concat)
      |> List.concat
      |> List.sortBy (fun (timing, _) -> timing)
diff --git a/tests/basictests/loadTestTests.fs b/tests/basictests/loadTestTests.fs
index c3135463..6e7f9f39 100644
--- a/tests/basictests/loadTestTests.fs
+++ b/tests/basictests/loadTestTests.fs
@@ -12,13 +12,19 @@ let all () =
             Warmup = true
             Baseline = true
             AcceptableRatioPercent = 200
-            Iterations = 1
+            Minutes = 1
+            Load = 1
             Tasks =
               [
                 {
-                  Description = "print hello world"
-                  Action = fun _ -> printfn "hello world"
-                  Frequency = 60
+                  Description = "task1"
+                  Action = fun _ -> printfn "task1"
+                  Frequency = 6
+                }
+                {
+                  Description = "task2"
+                  Action = fun _ -> printfn "task2"
+                  Frequency = 6
                 }
               ]
           }
@@ -31,7 +37,8 @@ let all () =
             Warmup = true
             Baseline = true
             AcceptableRatioPercent = 200
-            Iterations = 1
+            Minutes = 1
+            Load = 1
             Tasks =
               [
                 {

From 5e1fac40dd3a88b992002569982c386f1ee07e97 Mon Sep 17 00:00:00 2001
From: Chris Holt <lefthandedgoat@gmail.com>
Date: Tue, 7 Nov 2017 11:30:26 -0600
Subject: [PATCH 09/13] Load test - add pretty printing

---
 src/canopy.integration/loadTest.fs | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/canopy.integration/loadTest.fs b/src/canopy.integration/loadTest.fs
index 81389d21..cf6dc3c6 100644
--- a/src/canopy.integration/loadTest.fs
+++ b/src/canopy.integration/loadTest.fs
@@ -143,10 +143,7 @@ let private runTasksOnce job =
   manager.PostAndReply(fun replyChannel -> Manager.Retire replyChannel) |> ignore
   reporter.PostAndReply(fun replyChannel -> Reporter.Retire replyChannel)
 
-let private baseline job =
-  let results = runTasksOnce job
-  results |> List.iter (printfn "%A")
-  results
+let private baseline job = runTasksOnce job
 
 //warmup and baseline are the same but you ignore the results of warmup
 let private warmup job = runTasksOnce job |> ignore
@@ -180,6 +177,17 @@ let rec private iterateWorkers timingsAndWorkers (sw : System.Diagnostics.Stopwa
       System.Threading.Thread.Sleep(1)
       iterateWorkers timingsAndWorkers sw
 
+let printResults results =
+  printfn "Task                                                  MIN ms    MAX ms    AVG ms"
+  printfn "--------------------------------------------------------------------------------"
+  results
+  |> List.iter (fun result ->
+       let description = result.Description.PadRight(50, ' ')
+       let min = (sprintf "%.1f" result.Min).PadLeft(10, ' ')
+       let max = (sprintf "%.1f" result.Max).PadLeft(10, ' ')
+       let avg = (sprintf "%.1f" result.Average).PadLeft(10, ' ')
+       printfn "%s%s%s%s" description min max avg)
+
 let runLoadTest job =
   let manager = newManager ()
   let reporter = newReporter ()
@@ -204,7 +212,8 @@ let runLoadTest job =
   manager.PostAndReply(fun replyChannel -> Manager.Retire replyChannel) |> ignore
   let results = reporter.PostAndReply(fun replyChannel -> Reporter.Retire replyChannel)
 
-  printfn "%A" results
+  printResults results
+
   //if baselined validate times against baseline and fail if off
     //map diffs and print them
   //else

From 78fc52453e81093647f8b1bab418402487b5ce9a Mon Sep 17 00:00:00 2001
From: Chris Holt <lefthandedgoat@gmail.com>
Date: Tue, 7 Nov 2017 11:58:37 -0600
Subject: [PATCH 10/13] load test - basics of baseline and add more realsitic
 load functions

---
 src/canopy.integration/loadTest.fs |  6 ++++++
 tests/basictests/loadTestTests.fs  | 11 +++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/canopy.integration/loadTest.fs b/src/canopy.integration/loadTest.fs
index cf6dc3c6..3fb02947 100644
--- a/src/canopy.integration/loadTest.fs
+++ b/src/canopy.integration/loadTest.fs
@@ -214,6 +214,12 @@ let runLoadTest job =
 
   printResults results
 
+  if job.Baseline = true then
+    results
+    |> List.iter (fun result ->
+         let baselineResult = baselineResults |> List.find(fun baselineResult -> result.Description = baselineResult.Description)
+         if result.Average > baselineResult.Average * (float job.AcceptableRatioPercent / 100.0) then printfn "fail")
+
   //if baselined validate times against baseline and fail if off
     //map diffs and print them
   //else
diff --git a/tests/basictests/loadTestTests.fs b/tests/basictests/loadTestTests.fs
index 6e7f9f39..e62a29bd 100644
--- a/tests/basictests/loadTestTests.fs
+++ b/tests/basictests/loadTestTests.fs
@@ -2,6 +2,7 @@ module loadTestTests
 
 open canopy.runner
 open loadTest
+open System.Net
 
 let all () =
     context "tests for the load tester in integration"
@@ -18,12 +19,18 @@ let all () =
               [
                 {
                   Description = "task1"
-                  Action = fun _ -> printfn "task1"
+                  Action = (fun _ ->
+                    use client = new WebClient()
+                    client.DownloadString("http://www.turtletest.com/chris") |> ignore
+                    printfn "task1")
                   Frequency = 6
                 }
                 {
                   Description = "task2"
-                  Action = fun _ -> printfn "task2"
+                  Action = (fun _ ->
+                    use client = new WebClient()
+                    client.DownloadString("http://www.turtletest.com/chris") |> ignore
+                    printfn "task2")
                   Frequency = 6
                 }
               ]

From 3c7bcc70b84a6a95d6c9e090dc2e25d14204d007 Mon Sep 17 00:00:00 2001
From: Chris Holt <lefthandedgoat@gmail.com>
Date: Tue, 7 Nov 2017 12:57:27 -0600
Subject: [PATCH 11/13] load test - baselinining done

---
 src/canopy.integration/loadTest.fs | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/canopy.integration/loadTest.fs b/src/canopy.integration/loadTest.fs
index 3fb02947..a09f758c 100644
--- a/src/canopy.integration/loadTest.fs
+++ b/src/canopy.integration/loadTest.fs
@@ -2,6 +2,8 @@ module loadTest
 
 open System
 
+//IF YOU ARE READIN THIS, SKIP TO BOTTOM TO runLoadTest TO GET IDEAD OF MAIN FLOW
+
 let guid guid = System.Guid.Parse(guid)
 
 type Task =
@@ -188,6 +190,20 @@ let printResults results =
        let avg = (sprintf "%.1f" result.Average).PadLeft(10, ' ')
        printfn "%s%s%s%s" description min max avg)
 
+let runBaseline job baselineResults results =
+  if job.Baseline = true then
+    results
+    |> List.map (fun result ->
+         let baselineResult = baselineResults |> List.find(fun baselineResult -> result.Description = baselineResult.Description)
+         let threshold = baselineResult.Average * (float job.AcceptableRatioPercent / 100.0)
+         if result.Average > threshold then
+           Some (sprintf "FAILED: Average of %.1f exceeded threshold of %.1f for %s" result.Average threshold result.Description)
+         else None)
+    |> List.choose id
+  else []
+
+let failIfFailure results = if results <> [] then failwith (System.String.Concat(results, "\r\n"))
+
 let runLoadTest job =
   let manager = newManager ()
   let reporter = newReporter ()
@@ -214,15 +230,4 @@ let runLoadTest job =
 
   printResults results
 
-  if job.Baseline = true then
-    results
-    |> List.iter (fun result ->
-         let baselineResult = baselineResults |> List.find(fun baselineResult -> result.Description = baselineResult.Description)
-         if result.Average > baselineResult.Average * (float job.AcceptableRatioPercent / 100.0) then printfn "fail")
-
-  //if baselined validate times against baseline and fail if off
-    //map diffs and print them
-  //else
-    //print averages
-
-  ()
+  runBaseline job baselineResults results |> failIfFailure

From 78bc989f94cca0e125975ca6eff1c4e4241d340b Mon Sep 17 00:00:00 2001
From: Chris Holt <lefthandedgoat@gmail.com>
Date: Tue, 7 Nov 2017 14:32:39 -0600
Subject: [PATCH 12/13] load test - make c# interface

---
 csharptests/Program.cs                        | 35 +++++++++++++++++++
 .../canopy.integration.fsproj                 |  5 +--
 src/canopy.integration/chsharpLoadTest.fs     | 32 +++++++++++++++++
 src/canopy.integration/csharp.fs              |  4 +--
 src/canopy.integration/loadTest.fs            |  4 +--
 tests/basictests/loadTestTests.fs             |  4 +--
 6 files changed, 75 insertions(+), 9 deletions(-)
 create mode 100644 src/canopy.integration/chsharpLoadTest.fs

diff --git a/csharptests/Program.cs b/csharptests/Program.cs
index f96aa404..c6c2ad2a 100644
--- a/csharptests/Program.cs
+++ b/csharptests/Program.cs
@@ -1,5 +1,9 @@
 using System;
+using System.Collections.Generic;
+using System.Net;
 using canopy;
+using canopy.csharp.loadTest;
+using canopy.integration;
 using _ = canopy.csharp.canopy;
 
 namespace csharptests
@@ -121,6 +125,37 @@ static void Main(string[] args)
                 _.displayed(".contextmenu");
             });
 
+            _.skip("load test example", () =>
+            {
+                var job = new job(
+                    warmup: true,
+                    baseline: true,
+                    acceptableRatioPercent: 200,
+                    minutes: 1,
+                    load: 1,
+                    tasks: new List<task>
+                    {
+                        new task(
+                            description: "task1",
+                            action: () =>
+                            {
+                                using (var client = new WebClient()) { client.DownloadString("http://www.turtletest.com/chris");}
+                                Console.WriteLine("task1");
+                            },
+                            frequency: 6),
+                        new task(
+                            description: "task2",
+                            action: () =>
+                            {
+                                using (var client = new WebClient()) { client.DownloadString("http://www.turtletest.com/chris");}
+                                Console.WriteLine("task2");
+                            },
+                            frequency: 6)
+                    });
+
+                canopy.csharp.loadTest.runner.run(job);
+            });
+
             _.run();
 
             Console.ReadKey();
diff --git a/src/canopy.integration/canopy.integration.fsproj b/src/canopy.integration/canopy.integration.fsproj
index 4ecc19ab..b8ac2e17 100644
--- a/src/canopy.integration/canopy.integration.fsproj
+++ b/src/canopy.integration/canopy.integration.fsproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -54,6 +54,7 @@
     <Compile Include="jsonValidator.fs" />
     <Compile Include="loadTest.fs" />
     <Compile Include="csharp.fs" />
+    <Compile Include="chsharpLoadTest.fs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
@@ -97,4 +98,4 @@
       </ItemGroup>
     </When>
   </Choose>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/canopy.integration/chsharpLoadTest.fs b/src/canopy.integration/chsharpLoadTest.fs
new file mode 100644
index 00000000..a3687f01
--- /dev/null
+++ b/src/canopy.integration/chsharpLoadTest.fs
@@ -0,0 +1,32 @@
+namespace canopy.csharp.loadTest
+
+type task(description:string, action:System.Action, frequency:int) = 
+    member this.Description = description
+    member this.Action = action
+    member this.Frequency = frequency
+
+type job(warmup:bool, baseline:bool, acceptableRatioPercent:int, minutes:int, load: int, tasks:ResizeArray<task>) = 
+    member this.Warmup = warmup
+    member this.Baseline = baseline
+    member this.AcceptableRatioPercent = acceptableRatioPercent
+    member this.Minutes = minutes
+    member this.Load = load
+    member this.Tasks = tasks
+
+open canopy.integration.loadTest
+
+type runner () =
+    static member run (job:job) = 
+      let newJob =
+        {
+          Warmup = job.Warmup
+          Baseline = job.Baseline
+          AcceptableRatioPercent = job.AcceptableRatioPercent
+          Minutes = job.Minutes
+          Load = job.Load
+          Tasks = job.Tasks 
+                  |> Seq.map(fun task -> { Description = task.Description; Frequency = task.Frequency; Action = fun () -> task.Action.Invoke(); }) 
+                  |> List.ofSeq
+        }
+
+      runLoadTest newJob
\ No newline at end of file
diff --git a/src/canopy.integration/csharp.fs b/src/canopy.integration/csharp.fs
index 7eeae851..58277173 100644
--- a/src/canopy.integration/csharp.fs
+++ b/src/canopy.integration/csharp.fs
@@ -1,7 +1,5 @@
 namespace canopy.csharp
 
-
-
 type integration () =
 
     static member diffJson example actual =
@@ -9,4 +7,4 @@ type integration () =
         let diffString = diff |> List.map (fun d -> match d with | jsonValidator.Missing s -> sprintf "Missing %s" s | jsonValidator.Extra s -> sprintf "Extra %s" s)
         ResizeArray<string>(diffString)
 
-    static member validateJson example actual = jsonValidator.validate example actual
+    static member validateJson example actual = jsonValidator.validate example actual
\ No newline at end of file
diff --git a/src/canopy.integration/loadTest.fs b/src/canopy.integration/loadTest.fs
index a09f758c..56629581 100644
--- a/src/canopy.integration/loadTest.fs
+++ b/src/canopy.integration/loadTest.fs
@@ -1,8 +1,8 @@
-module loadTest
+module canopy.integration.loadTest
 
 open System
 
-//IF YOU ARE READIN THIS, SKIP TO BOTTOM TO runLoadTest TO GET IDEAD OF MAIN FLOW
+//IF YOU ARE READING THIS, SKIP TO BOTTOM TO runLoadTest TO GET IDEAD OF MAIN FLOW
 
 let guid guid = System.Guid.Parse(guid)
 
diff --git a/tests/basictests/loadTestTests.fs b/tests/basictests/loadTestTests.fs
index e62a29bd..fa395d56 100644
--- a/tests/basictests/loadTestTests.fs
+++ b/tests/basictests/loadTestTests.fs
@@ -1,13 +1,13 @@
 module loadTestTests
 
 open canopy.runner
-open loadTest
+open canopy.integration.loadTest
 open System.Net
 
 let all () =
     context "tests for the load tester in integration"
 
-    "can create a basic job" &&&& fun _ ->
+    "can create a basic job" &&! fun _ ->
         let job =
           {
             Warmup = true

From a4a150f6119665e15b56b71f6158fc3104bf7a79 Mon Sep 17 00:00:00 2001
From: Chris Holt <lefthandedgoat@gmail.com>
Date: Tue, 7 Nov 2017 14:34:40 -0600
Subject: [PATCH 13/13] load test - undo test changes

---
 tests/basictests/Program.fs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/basictests/Program.fs b/tests/basictests/Program.fs
index bd30a5dd..e9982509 100644
--- a/tests/basictests/Program.fs
+++ b/tests/basictests/Program.fs
@@ -5,14 +5,14 @@ open OpenQA.Selenium
 open canopy
 open reporters
 
-//start chrome
+start chrome
 let mainBrowser = browser
 elementTimeout <- 3.0
 compareTimeout <- 3.0
 pageTimeout <- 3.0
 runFailedContextsFirst <- false
-//reporter <- new LiveHtmlReporter(Chrome, configuration.chromeDir) :> IReporter
-//reporter.setEnvironment "My Machine"
+reporter <- new LiveHtmlReporter(Chrome, configuration.chromeDir) :> IReporter
+reporter.setEnvironment "My Machine"
 configuration.failureMessagesThatShoulBeTreatedAsSkip <- ["Skip me when I fail"]
 
 configuration.failScreenshotFileName <-
@@ -28,8 +28,8 @@ loadTestTests.all()
 
 jsonValidatorTests.all()
 
-//file1.all()
-//file2.all()
+file1.all()
+file2.all()
 
 context "context1"
 once (fun _ -> Console.WriteLine "once")