Merge branch 'master' into fixes/git-lfs

StanleyGoldman · web-flow · commit 02397b81b194 · 2017-05-23T18:20:02.000+02:00
diff --git a/src/IntegrationTests/Events/RepositoryManagerTests.cs b/src/IntegrationTests/Events/RepositoryManagerTests.cs
@@ -315,7 +315,7 @@ public void ShouldDetectChangesToRemotes()
             repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);
         }
 
-        [Test]
+        [Test, Ignore("Failing on CI, needs fixing")]
         public void ShouldDetectGitPull()
         {
             InitializeEnvironment(TestRepoMasterCleanSynchronized);
diff --git a/src/IntegrationTests/Events/RepositoryWatcherTests.cs b/src/IntegrationTests/Events/RepositoryWatcherTests.cs
@@ -275,7 +275,7 @@ public void ShouldDetectChangesToRemotes()
             }
         }
 
-        [Test]
+        [Test, Ignore("Failing on CI, needs fixing")]
         public void ShouldDetectGitPull()
         {
             InitializeEnvironment(TestRepoMasterCleanSynchronized);

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ public void ShouldDetectChangesToRemotes()`
`315`	`315`	`repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock);`
`316`	`316`	`}`
`317`	`317`
`318`		`- [Test]`
	`318`	`+ [Test, Ignore("Failing on CI, needs fixing")]`
`319`	`319`	`public void ShouldDetectGitPull()`
`320`	`320`	`{`
`321`	`321`	`InitializeEnvironment(TestRepoMasterCleanSynchronized);`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ public void ShouldDetectChangesToRemotes()`
`275`	`275`	`}`
`276`	`276`	`}`
`277`	`277`
`278`		`- [Test]`
	`278`	`+ [Test, Ignore("Failing on CI, needs fixing")]`
`279`	`279`	`public void ShouldDetectGitPull()`
`280`	`280`	`{`
`281`	`281`	`InitializeEnvironment(TestRepoMasterCleanSynchronized);`