Merge branch 'fixes/dont-run-time-sensitive-tests' into fixes/open-source-ready

StanleyGoldman · StanleyGoldman · commit 0e038ac05f74 · 2017-06-20T12:11:27.000-04:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -42,6 +42,7 @@ test:
   categories:
     except:
     - DoNotRunOnAppVeyor
+    - TimeSensitive
 artifacts:
 - path: unity\TestProject\Assets\Editor\*.dll
 - path: unity\TestProject\Assets\Editor\*.pdb
diff --git a/src/tests/IntegrationTests/Events/RepositoryManagerTests.cs b/src/tests/IntegrationTests/Events/RepositoryManagerTests.cs
@@ -10,6 +10,7 @@
 
 namespace IntegrationTests
 {
+    [TestFixture, Category("TimeSensitive")]
     class RepositoryManagerTests : BaseGitEnvironmentTest
     {
         [Test]
diff --git a/src/tests/IntegrationTests/Events/RepositoryWatcherTests.cs b/src/tests/IntegrationTests/Events/RepositoryWatcherTests.cs
@@ -9,6 +9,7 @@
 
 namespace IntegrationTests
 {
+    [TestFixture, Category("TimeSensitive")]
     class RepositoryWatcherTests : BaseGitEnvironmentTest
     {
         private const int ThreadSleepTimeout = 2000;
diff --git a/src/tests/IntegrationTests/IntegrationTests.v3.ncrunchproject b/src/tests/IntegrationTests/IntegrationTests.v3.ncrunchproject
@@ -11,6 +11,9 @@
       <NamedTestSelector>
         <TestName>IntegrationTests.GitSetupTests.InstallGit</TestName>
       </NamedTestSelector>
+      <NamedTestSelector>
+        <TestName>IntegrationTests.GitSetupTests.VerifyGitLfsBundle</TestName>
+      </NamedTestSelector>
     </IgnoredTests>
     <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
     <RunPostBuildEvents>True</RunPostBuildEvents>
diff --git a/src/tests/TaskSystemIntegrationTests/TaskSystem.v3.ncrunchproject b/src/tests/TaskSystemIntegrationTests/TaskSystem.v3.ncrunchproject
@@ -1,5 +1,16 @@
 ﻿<ProjectConfiguration>
   <Settings>
+    <IgnoredTests>
+      <NamedTestSelector>
+        <TestName>IntegrationTests.SchedulerTests.ChainingOnDifferentSchedulers</TestName>
+      </NamedTestSelector>
+      <NamedTestSelector>
+        <TestName>IntegrationTests.SchedulerTests.ConcurrentSchedulerWithDependencyOrdering</TestName>
+      </NamedTestSelector>
+      <NamedTestSelector>
+        <TestName>IntegrationTests.SchedulerTests.NonUITasksAlwaysRunOnDifferentThreadFromUITasks</TestName>
+      </NamedTestSelector>
+    </IgnoredTests>
     <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
   </Settings>
 </ProjectConfiguration>
diff --git a/src/tests/UnitTests/UnitTests.v3.ncrunchproject b/src/tests/UnitTests/UnitTests.v3.ncrunchproject
@@ -6,6 +6,11 @@
     <HiddenComponentWarnings>
       <Value>PostBuildEventDisabled</Value>
     </HiddenComponentWarnings>
+    <IgnoredTests>
+      <FixtureTestSelector>
+        <FixtureName>UnitTests.RepositoryManagerTests</FixtureName>
+      </FixtureTestSelector>
+    </IgnoredTests>
     <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
   </Settings>
 </ProjectConfiguration>

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`
`11`	`11`	`namespace IntegrationTests`
`12`	`12`	`{`
	`13`	`+ [TestFixture, Category("TimeSensitive")]`
`13`	`14`	`class RepositoryManagerTests : BaseGitEnvironmentTest`
`14`	`15`	`{`
`15`	`16`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace IntegrationTests`
`11`	`11`	`{`
	`12`	`+ [TestFixture, Category("TimeSensitive")]`
`12`	`13`	`class RepositoryWatcherTests : BaseGitEnvironmentTest`
`13`	`14`	`{`
`14`	`15`	`private const int ThreadSleepTimeout = 2000;`