Merge shana/fix-fix-fix into releases/0.30

shana · shana · commit 80cc01afe9b6 · 2018-03-20T11:20:14.000-07:00
diff --git a/src/GitHub.Api/Application/ApplicationInfo.cs b/src/GitHub.Api/Application/ApplicationInfo.cs
@@ -4,7 +4,7 @@ namespace GitHub.Unity
     static partial class ApplicationInfo
     {
 #if DEBUG
-        public const string ApplicationName = "GitHubUnityDebug";
+        public const string ApplicationName = "GitHub for Unity Debug";
         public const string ApplicationProvider = "GitHub";
 #else
         public const string ApplicationName = "GitHubUnity";
diff --git a/src/GitHub.Api/Application/ApplicationManagerBase.cs b/src/GitHub.Api/Application/ApplicationManagerBase.cs
@@ -84,16 +84,15 @@ public void Run(bool firstRun)
                     if (path.IsInitialized)
                         return;
 
-                    Logger.Trace("No git path found in settings");
+                    Logger.Trace("Using portable git");
 
-                    var gitInstaller = new GitInstaller(Environment, CancellationToken);
+                    var gitInstaller = new GitInstaller(Environment, ProcessManager, TaskManager);
 
-                    // if successful, continue with environment initialization, otherwise try to find an existing git installation
                     var task = gitInstaller.SetupGitIfNeeded();
                     task.Progress(progressReporter.UpdateProgress);
                     task.OnEnd += (thisTask, result, success, exception) =>
                     {
-                        thisTask.Then(initEnvironmentTask, taskIsTopOfChain: true);
+                        thisTask.GetEndOfChain().Then(initEnvironmentTask, taskIsTopOfChain: true);
                     };
 
                     // append installer task to top chain
diff --git a/src/GitHub.Api/Installer/GitInstaller.cs b/src/GitHub.Api/Installer/GitInstaller.cs
@@ -10,47 +10,62 @@ class GitInstaller
         private readonly CancellationToken cancellationToken;
 
         private readonly IEnvironment environment;
+        private readonly IProcessManager processManager;
         private readonly GitInstallDetails installDetails;
         private readonly IZipHelper sharpZipLibHelper;
 
         GitInstallationState installationState;
         ITask<NPath> installationTask;
 
-        public GitInstaller(IEnvironment environment, CancellationToken cancellationToken,
+        public GitInstaller(IEnvironment environment, IProcessManager processManager,
+            ITaskManager taskManager,
             GitInstallDetails installDetails = null)
         {
             this.environment = environment;
+            this.processManager = processManager;
             this.sharpZipLibHelper = ZipHelper.Instance;
-            this.cancellationToken = cancellationToken;
+            this.cancellationToken = taskManager.Token;
             this.installDetails = installDetails ?? new GitInstallDetails(environment.UserCachePath, environment.IsWindows);
         }
 
         public ITask<NPath> SetupGitIfNeeded()
         {
             //Logger.Trace("SetupGitIfNeeded");
 
-            installationTask = new FuncTask<NPath>(cancellationToken, (_) => installDetails.GitExecutablePath)
+            installationTask = new FuncTask<NPath, NPath>(cancellationToken, (success, path) =>
+                    {
+                        return path;
+                    })
                 { Name = "Git Installation - Complete" };
             installationTask.OnStart += thisTask => thisTask.UpdateProgress(0, 100);
             installationTask.OnEnd += (thisTask, result, success, exception) => thisTask.UpdateProgress(100, 100);
 
+            ITask<NPath> startTask = null;
             if (!environment.IsWindows)
             {
-                return new FindExecTask("git", cancellationToken)
-                    .Then(installationTask, taskIsTopOfChain: true);
-            }
-
-            var startTask = new FuncTask<NPath>(cancellationToken, () =>
+                startTask = new FindExecTask("git", cancellationToken)
+                    .Configure(processManager);
+                // we should doublecheck that system git is usable here
+                installationState = new GitInstallationState
                 {
-                    installationState = VerifyGitInstallation();
-                    if (!installationState.GitIsValid && !installationState.GitLfsIsValid)
-                        installationState = GrabZipFromResources(installationState);
-                    else
-                        Logger.Trace("SetupGitIfNeeded: Skipped");
-                    return installDetails.GitExecutablePath;
-                })
+                    GitIsValid = true,
+                    GitLfsIsValid = true
+                };
+            }
+            else
+            {
+                startTask = new FuncTask<NPath>(cancellationToken, () =>
+                    {
+                        installationState = VerifyGitInstallation();
+                        if (!installationState.GitIsValid && !installationState.GitLfsIsValid)
+                            installationState = GrabZipFromResources(installationState);
+                        else
+                            Logger.Trace("SetupGitIfNeeded: Skipped");
+                        return installDetails.GitExecutablePath;
+                    })
                 { Name = "Git Installation - Extract" };
 
+            }
 
             startTask.OnEnd += (thisTask, path, success, exception) =>
             {
diff --git a/src/GitHub.Api/Installer/UnzipTask.cs b/src/GitHub.Api/Installer/UnzipTask.cs
@@ -9,7 +9,6 @@ class UnzipTask : TaskBase<NPath>
         private readonly NPath extractedPath;
         private readonly IZipHelper zipHelper;
         private readonly IFileSystem fileSystem;
-        private readonly string expectedMD5;
 
         public UnzipTask(CancellationToken token, NPath archiveFilePath, NPath extractedPath,
             IZipHelper zipHelper, IFileSystem fileSystem)
diff --git a/src/tests/IntegrationTests/BaseIntegrationTest.cs b/src/tests/IntegrationTests/BaseIntegrationTest.cs
@@ -152,19 +152,22 @@ protected void SetupGit(NPath pathToSetupGitInto, string testName)
             AssemblyResources.ToFile(ResourceType.Platform, "git-lfs.zip", zipArchivesPath, Environment);
             AssemblyResources.ToFile(ResourceType.Platform, "git-lfs.zip.md5", zipArchivesPath, Environment);
 
-            var gitInstaller = new GitInstaller(Environment, TaskManager.Token, installDetails);
+            var gitInstaller = new GitInstaller(Environment, ProcessManager, TaskManager, installDetails);
 
             NPath? result = null;
             Exception ex = null;
 
             var setupTask = gitInstaller.SetupGitIfNeeded();
-            setupTask.OnEnd += (thisTask, path, success, exception) => {
-                result = path;
-                ex = exception;
-                autoResetEvent.Set();
+            setupTask.OnEnd += (thisTask, _, __, ___) => {
+                ((ITask<NPath>)thisTask.GetEndOfChain()).OnEnd += (t, path, success, exception) =>
+                {
+                    result = path;
+                    ex = exception;
+                    autoResetEvent.Set();
+                };
             };
-
-            if (!autoResetEvent.WaitOne(TimeSpan.FromMinutes(1)))
+            setupTask.Start();
+            if (!autoResetEvent.WaitOne(TimeSpan.FromMinutes(5)))
                 throw new TimeoutException($"Test setup unzipping {zipArchivesPath} to {pathToSetupGitInto} timed out");
 
             if (result == null)
@@ -197,7 +200,7 @@ public virtual void TestFixtureTearDown()
         [SetUp]
         public virtual void OnSetup()
         {
-            TestBasePath = NPath.CreateTempDirectory("integration-tests");
+            TestBasePath = NPath.CreateTempDirectory("integration tests");
             NPath.FileSystem.SetCurrentDirectory(TestBasePath);
             TestRepoMasterCleanUnsynchronized = TestBasePath.Combine("IOTestsRepo", "IOTestsRepo_master_clean_unsync");
             TestRepoMasterCleanUnsynchronizedRussianLanguage = TestBasePath.Combine("IOTestsRepo", "IOTestsRepo_master_clean_sync_with_russian_language");
diff --git a/src/tests/IntegrationTests/Installer/GitInstallerTests.cs b/src/tests/IntegrationTests/Installer/GitInstallerTests.cs
@@ -49,9 +49,9 @@ public void GitInstallTest()
 
             TestBasePath.Combine("git").CreateDirectory();
 
-            var gitInstaller = new GitInstaller(Environment, CancellationToken.None, installDetails);
+            var gitInstaller = new GitInstaller(Environment, ProcessManager, TaskManager, installDetails);
             var startTask = gitInstaller.SetupGitIfNeeded();
-            var endTask = new FuncTask<NPath, NPath>(CancellationToken.None, (s, path) => path);
+            var endTask = new FuncTask<NPath, NPath>(TaskManager.Token, (s, path) => path);
             startTask.OnEnd += (thisTask, path, success, exception) => thisTask.GetEndOfChain().Then(endTask);
             startTask.Start();
             NPath? resultPath = null;
diff --git a/src/tests/IntegrationTests/IntegrationTestEnvironment.cs b/src/tests/IntegrationTests/IntegrationTestEnvironment.cs
@@ -12,8 +12,6 @@ class IntegrationTestEnvironment : IEnvironment
         private static readonly ILogging logger = LogHelper.GetLogger<IntegrationTestEnvironment>();
         private readonly bool enableTrace;
 
-        private readonly NPath integrationTestEnvironmentPath;
-
         private DefaultEnvironment defaultEnvironment;
 
         public IntegrationTestEnvironment(ICacheContainer cacheContainer,
@@ -26,13 +24,10 @@ public IntegrationTestEnvironment(ICacheContainer cacheContainer,
             defaultEnvironment = new DefaultEnvironment(cacheContainer);
             defaultEnvironment.FileSystem.SetCurrentDirectory(repoPath);
             environmentPath = environmentPath ??
-                defaultEnvironment.GetSpecialFolder(Environment.SpecialFolder.LocalApplicationData)
-                                  .ToNPath()
-                                  .EnsureDirectoryExists(ApplicationInfo.ApplicationName + "-IntegrationTests");
+                defaultEnvironment.UserCachePath.EnsureDirectoryExists("IntegrationTests");
 
-            integrationTestEnvironmentPath = environmentPath.Value;
-            UserCachePath = integrationTestEnvironmentPath.Combine("User");
-            SystemCachePath = integrationTestEnvironmentPath.Combine("System");
+            UserCachePath = environmentPath.Value.Combine("User");
+            SystemCachePath = environmentPath.Value.Combine("System");
 
             var installPath = solutionDirectory.Parent.Parent.Combine("src", "GitHub.Api");
 
@@ -76,7 +71,7 @@ public string GetEnvironmentVariable(string v)
 
         public string GetSpecialFolder(Environment.SpecialFolder folder)
         {
-            var ensureDirectoryExists = integrationTestEnvironmentPath.EnsureDirectoryExists(folder.ToString());
+            var ensureDirectoryExists = UserCachePath.Parent.EnsureDirectoryExists(folder.ToString());
             var specialFolderPath = ensureDirectoryExists.ToString();
 
             if (enableTrace)
@@ -87,7 +82,7 @@ public string GetSpecialFolder(Environment.SpecialFolder folder)
             return specialFolderPath;
         }
 
-        public string UserProfilePath => integrationTestEnvironmentPath.CreateDirectory("user-profile-path");
+        public string UserProfilePath => UserCachePath.Parent.CreateDirectory("user profile path");
 
         public NPath Path => Environment.GetEnvironmentVariable("PATH").ToNPath();
         public string NewLine => Environment.NewLine;
diff --git a/src/tests/IntegrationTests/UnzipTaskTests.cs b/src/tests/IntegrationTests/UnzipTaskTests.cs
@@ -36,26 +36,5 @@ public async Task UnzipWorks()
 
             extractedPath.DirectoryExists().Should().BeTrue();
         }
-
-        [Test]
-        public void FailsWhenMD5Incorrect()
-        {
-            InitializeTaskManager();
-
-            var cacheContainer = Substitute.For<ICacheContainer>();
-            Environment = new IntegrationTestEnvironment(cacheContainer, TestBasePath, SolutionDirectory);
-
-            var destinationPath = TestBasePath.Combine("gitlfs_zip").CreateDirectory();
-            var archiveFilePath = AssemblyResources.ToFile(ResourceType.Platform, "git-lfs.zip", destinationPath, Environment);
-
-            var extractedPath = TestBasePath.Combine("gitlfs_zip_extracted").CreateDirectory();
-
-            var unzipTask = new UnzipTask(CancellationToken.None, archiveFilePath, extractedPath, 
-                ZipHelper.Instance, Environment.FileSystem);
-
-            Assert.Throws<UnzipException>(async () => await unzipTask.StartAwait());
-
-            extractedPath.DirectoryExists().Should().BeFalse();
-        }
     }
 }
diff --git a/src/tests/TaskSystemIntegrationTests/Tests.cs b/src/tests/TaskSystemIntegrationTests/Tests.cs
@@ -43,7 +43,7 @@ public void OneTimeSetup()
             TaskManager.UIScheduler = new SynchronizationContextTaskScheduler(syncContext);
 
             var env = new DefaultEnvironment();
-            TestBasePath = NPath.CreateTempDirectory("integration-tests");
+            TestBasePath = NPath.CreateTempDirectory("integration tests");
             env.FileSystem.SetCurrentDirectory(TestBasePath);
 
             var repo = Substitute.For<IRepository>();

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace GitHub.Unity`
`4`	`4`	`static partial class ApplicationInfo`
`5`	`5`	`{`
`6`	`6`	`#if DEBUG`
`7`		`- public const string ApplicationName = "GitHubUnityDebug";`
	`7`	`+ public const string ApplicationName = "GitHub for Unity Debug";`
`8`	`8`	`public const string ApplicationProvider = "GitHub";`
`9`	`9`	`#else`
`10`	`10`	`public const string ApplicationName = "GitHubUnity";`