Merge branch 'master' into fix-authentication-again

StanleyGoldman · web-flow · commit b0ee14ea3a20 · 2018-08-01T12:37:42.000-04:00
diff --git a/src/GitHub.Api/Application/ApplicationManagerBase.cs b/src/GitHub.Api/Application/ApplicationManagerBase.cs
@@ -137,7 +137,7 @@ public void Run()
                         RestartRepository();
                     }
 
-                    progress.UpdateProgress(100, 100, "Initialization failed");
+                    progress.UpdateProgress(100, 100, "Initialized");
                 }
                 catch (Exception ex)
                 {
diff --git a/src/tests/IntegrationTests/Process/ProcessManagerIntegrationTests.cs b/src/tests/IntegrationTests/Process/ProcessManagerIntegrationTests.cs
@@ -13,6 +13,7 @@ namespace IntegrationTests
     class ProcessManagerIntegrationTests : BaseGitEnvironmentTest
     {
         [Test]
+        [Category("DoNotRunOnAppVeyor")]
         public async Task BranchListTest()
         {
             InitializePlatformAndEnvironment(TestRepoMasterCleanUnsynchronized);

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public void Run()`
`137`	`137`	`RestartRepository();`
`138`	`138`	`}`
`139`	`139`
`140`		`- progress.UpdateProgress(100, 100, "Initialization failed");`
	`140`	`+ progress.UpdateProgress(100, 100, "Initialized");`
`141`	`141`	`}`
`142`	`142`	`catch (Exception ex)`
`143`	`143`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ namespace IntegrationTests`
`13`	`13`	`class ProcessManagerIntegrationTests : BaseGitEnvironmentTest`
`14`	`14`	`{`
`15`	`15`	`[Test]`
	`16`	`+ [Category("DoNotRunOnAppVeyor")]`
`16`	`17`	`public async Task BranchListTest()`
`17`	`18`	`{`
`18`	`19`	`InitializePlatformAndEnvironment(TestRepoMasterCleanUnsynchronized);`