Fixing tests

Author: StanleyGoldman

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -88,7 +88,6 @@ public void Run(bool firstRun)
 
             var applicationDataPath = Environment.GetSpecialFolder(System.Environment.SpecialFolder.LocalApplicationData).ToNPath();
             var installDetails = new GitInstallDetails(applicationDataPath, true);
-
             var gitInstaller = new GitInstaller(Environment, CancellationToken, installDetails);
             gitInstaller.SetupGitIfNeeded(new ActionTask<NPath>(CancellationToken, (b, s) => {
 

src/tests/IntegrationTests/BasePlatformIntegrationTest.cs

@@ -1,8 +1,10 @@
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Unity;
 using NSubstitute;
+using Octokit;
 
 namespace IntegrationTests
 {
@@ -29,14 +31,38 @@ protected void InitializePlatform(NPath repoPath, NPath environmentPath, bool en
 
             if (setupGit)
             {
+                var autoResetEvent = new AutoResetEvent(false);
+
                 var applicationDataPath = Environment.GetSpecialFolder(System.Environment.SpecialFolder.LocalApplicationData).ToNPath();
                 var installDetails = new GitInstallDetails(applicationDataPath, true);
-                //var gitInstallTask = new PortableGitInstallTask(CancellationToken.None, Environment, installDetails);
+                var gitInstaller = new GitInstaller(Environment, CancellationToken.None, installDetails);
+
+                NPath result = null;
+                Exception ex = null;
+
+                gitInstaller.SetupGitIfNeeded(new ActionTask<NPath>(CancellationToken.None, (b, path) => {
+                        result = path;
+                        autoResetEvent.Set();
+                    }),
+                    new ActionTask(CancellationToken.None, (b, exception) => {
+                        ex = exception;
+                        autoResetEvent.Set();
+                    }));
+
+                autoResetEvent.WaitOne();
+
+                if (result == null)
+                {
+                    if (ex != null)
+                    {
+                        throw ex;
+                    }
 
-                //var installPath = gitInstallTask.Start().Result;
-                //Environment.GitExecutablePath = installPath;
+                    throw new Exception("Did not install git");
+                }
 
-                //GitClient = new GitClient(Environment, ProcessManager, TaskManager.Token);
+                Environment.GitExecutablePath = result;
+                GitClient = new GitClient(Environment, ProcessManager, TaskManager.Token);
             }
         }
     }