Fix #350 tc showing passed instead of ignored

lefthandedgoat · Mar 12, 2017 · 22d0c8c · 22d0c8c
1 parent dc5216c
commit 22d0c8c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 23 deletions.
diff --git a/csharptests/csharptests.csproj b/csharptests/csharptests.csproj
@@ -65,25 +65,5 @@
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
-      <ItemGroup>
-        <Reference Include="WebDriver">
-          <HintPath>..\..\packages\Selenium.WebDriver\lib\net35\WebDriver.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
-      <ItemGroup>
-        <Reference Include="WebDriver">
-          <HintPath>..\..\packages\Selenium.WebDriver\lib\net40\WebDriver.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
+  -->  
 </Project>
diff --git a/src/canopy/runner.fs b/src/canopy/runner.fs
@@ -147,6 +147,8 @@ let private processRunResult suite (test : Test) result =
     | FailFast -> ()
     | Failed -> ()
 
+    reporter.testEnd test.Id
+
 let private runtest (suite : suite) (test : Test) =
     if failed = false then
         reporter.testStart test.Id
@@ -168,8 +170,7 @@ let private runtest (suite : suite) (test : Test) =
                 match testResult with
                 | Failed -> testResult
                 | _ -> afterResult
-
-        reporter.testEnd test.Id
+
         failureMessage <- null
         result
     else