Make sure git integration tests setup the right git

Author: shana

src/GitHub.Api/Helpers/AssemblyResources.cs

@@ -39,24 +39,17 @@ Each file's name is their physical path in the project.
                 : resourceType == ResourceType.Platform ? "PlatformResources"
                 : "Resources";
 
+            // all the resources are embedded in GitHub.Api
             var asm = Assembly.GetCallingAssembly();
-            if (!asm.FullName.StartsWith("IntegrationTests"))
+            if (resourceType != ResourceType.Icon)
                 asm = typeof(AssemblyResources).Assembly;
             var stream = asm.GetManifestResourceStream(
                                      String.Format("GitHub.Unity.{0}{1}.{2}", type, !string.IsNullOrEmpty(os) ? "." + os : os, resource));
             if (stream != null)
                 return destinationPath.Combine(resource).WriteAllBytes(stream.ToByteArray());
 
-            // check the GitHub.Api assembly
-            if (!asm.FullName.StartsWith("GitHub.Api"))
-            {
-                asm = typeof(ApplicationManagerBase).Assembly;
-                stream = asm.GetManifestResourceStream(
-                                        String.Format("GitHub.Unity.{0}{1}.{2}", type, !string.IsNullOrEmpty(os) ? "." + os : os, resource));
-                if (stream != null)
-                    return destinationPath.Combine(resource).WriteAllBytes(stream.ToByteArray());
-            }
-
+            // if we're not in the test runner, we might be running in a Unity-compiled GitHub.Unity assembly, which doesn't
+            // embed the resources in the assembly
             if (!Guard.InUnitTestRunner)
             {
                 // check the filesystem

src/tests/IntegrationTests/BaseIntegrationTest.cs

@@ -70,7 +70,6 @@ protected void InitializeEnvironment(NPath repoPath,
 
         protected void InitializePlatform(NPath repoPath,
             bool enableEnvironmentTrace = true,
-            bool setupGit = true,
             string testName = "")
         {
             InitializeTaskManager();
@@ -79,9 +78,6 @@ protected void InitializePlatform(NPath repoPath,
             ProcessManager = new ProcessManager(Environment, GitEnvironment, TaskManager.Token);
 
             Platform.Initialize(ProcessManager, TaskManager);
-
-            if (setupGit)
-                SetupGit(Environment.GetSpecialFolder(System.Environment.SpecialFolder.LocalApplicationData).ToNPath(), testName);
         }
 
         protected void InitializeTaskManager()
@@ -93,12 +89,12 @@ protected void InitializeTaskManager()
 
         protected IEnvironment InitializePlatformAndEnvironment(NPath repoPath,
             bool enableEnvironmentTrace = false,
-            bool setupGit = true,
             Action<IRepositoryManager> onRepositoryManagerCreated = null,
             [CallerMemberName] string testName = "")
         {
             InitializeEnvironment(repoPath, enableEnvironmentTrace, true);
-            InitializePlatform(repoPath, enableEnvironmentTrace: enableEnvironmentTrace, setupGit: setupGit, testName: testName);
+            InitializePlatform(repoPath, enableEnvironmentTrace: enableEnvironmentTrace, testName: testName);
+            SetupGit(Environment.GetSpecialFolder(System.Environment.SpecialFolder.LocalApplicationData).ToNPath(), testName);
 
             DotGitPath = repoPath.Combine(".git");
 
@@ -128,38 +124,38 @@ protected IEnvironment InitializePlatformAndEnvironment(NPath repoPath,
 
         protected void SetupGit(NPath pathToSetupGitInto, string testName)
         {
-            var autoResetEvent = new AutoResetEvent(false);
-
             var installDetails = new GitInstaller.GitInstallDetails(pathToSetupGitInto, Environment.IsWindows);
-
-            var zipArchivesPath = pathToSetupGitInto.Combine("downloads").CreateDirectory();
-
-            Logger.Trace($"Saving git zips into {zipArchivesPath} and unzipping to {pathToSetupGitInto}");
-
-            AssemblyResources.ToFile(ResourceType.Platform, "git.zip", zipArchivesPath, Environment);
-            AssemblyResources.ToFile(ResourceType.Platform, "git.zip.md5", zipArchivesPath, Environment);
-            AssemblyResources.ToFile(ResourceType.Platform, "git-lfs.zip", zipArchivesPath, Environment);
-            AssemblyResources.ToFile(ResourceType.Platform, "git-lfs.zip.md5", zipArchivesPath, Environment);
-
-            var gitInstaller = new GitInstaller(Environment, ProcessManager, TaskManager.Token, null, installDetails: installDetails);
-
-            Exception ex = null;
-
-            var state = gitInstaller.SetupGitIfNeeded();
-            var result = state.GitExecutablePath;
-
-            if (!result.IsInitialized)
-            {
-                if (ex != null)
-                {
-                    throw ex;
-                }
-
-                throw new Exception("Did not install git");
-            }
-
-            Environment.GitExecutablePath = result;
+            Environment.GitExecutablePath = installDetails.GitExecutablePath;
             GitClient = new GitClient(Environment, ProcessManager, TaskManager.Token);
+
+            if (installDetails.GitExecutablePath.FileExists() && installDetails.GitLfsExecutablePath.FileExists())
+                return;
+
+            installDetails.GitInstallationPath.DeleteIfExists();
+
+            installDetails.GitZipPath.EnsureParentDirectoryExists();
+            installDetails.GitLfsZipPath.EnsureParentDirectoryExists();
+
+            AssemblyResources.ToFile(ResourceType.Platform, "git.zip", installDetails.GitZipPath.Parent, Environment);
+            AssemblyResources.ToFile(ResourceType.Platform, "git.json", installDetails.GitZipPath.Parent, Environment);
+            AssemblyResources.ToFile(ResourceType.Platform, "git-lfs.zip", installDetails.GitZipPath.Parent, Environment);
+            AssemblyResources.ToFile(ResourceType.Platform, "git-lfs.json", installDetails.GitZipPath.Parent, Environment);
+
+            var tempZipExtractPath = TestBasePath.Combine("setup", "git_zip_extract_zip_paths").EnsureDirectoryExists();
+            var extractPath = tempZipExtractPath.Combine("git").CreateDirectory();
+            var path = new UnzipTask(TaskManager.Token, installDetails.GitZipPath, extractPath, null, Environment.FileSystem)
+                .Catch(e => true)
+                .RunWithReturn(true);
+            var source = path;
+            installDetails.GitInstallationPath.EnsureParentDirectoryExists();
+            source.Move(installDetails.GitInstallationPath);
+
+            extractPath = tempZipExtractPath.Combine("git-lfs").CreateDirectory();
+            path = new UnzipTask(TaskManager.Token, installDetails.GitLfsZipPath, extractPath, null, Environment.FileSystem)
+                .Catch(e => true)
+                .RunWithReturn(true);
+            source = path.Combine(installDetails.GitLfsExecutable);
+            source.Move(installDetails.GitLfsExecutablePath);
         }
 
         [TestFixtureSetUp]

src/tests/IntegrationTests/Git/GitClientTests.cs

@@ -7,7 +7,7 @@
 namespace IntegrationTests
 {
     [TestFixture]
-    class GitClientTests : BaseGitTestWithHttpServer
+    class A_GitClientTests : BaseGitTestWithHttpServer
     {
         protected override int Timeout { get; set; } = 5 * 60 * 1000;
 

src/tests/IntegrationTests/Installer/GitInstallerTests.cs

@@ -18,7 +18,7 @@ public override void OnSetup()
         {
             base.OnSetup();
             InitializeEnvironment(TestBasePath, false, false);
-            InitializePlatform(TestBasePath, setupGit: false);
+            InitializePlatform(TestBasePath);
         }
 
         private TestWebServer.HttpServer server;
@@ -168,7 +168,7 @@ public override void OnSetup()
         {
             base.OnSetup();
             InitializeEnvironment(TestBasePath, false, false);
-            InitializePlatform(TestBasePath, setupGit: false);
+            InitializePlatform(TestBasePath);
         }
 
         [Test]

src/tests/IntegrationTests/IntegrationTests.csproj

@@ -115,17 +115,6 @@
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
-    <EmbeddedResource Include="PlatformResources\mac\git-lfs.zip" />
-    <EmbeddedResource Include="PlatformResources\mac\gitconfig" />
-    <EmbeddedResource Include="PlatformResources\windows\git-lfs.zip" />
-    <EmbeddedResource Include="PlatformResources\windows\git.zip" />
-    <EmbeddedResource Include="PlatformResources\windows\gitconfig" />
-    <EmbeddedResource Include="PlatformResources\linux\git-lfs.zip" />
-    <EmbeddedResource Include="PlatformResources\linux\git-lfs.zip.md5" />
-    <EmbeddedResource Include="PlatformResources\mac\git-lfs.zip.md5" />
-    <EmbeddedResource Include="PlatformResources\windows\git-lfs.zip.md5" />
-    <EmbeddedResource Include="PlatformResources\windows\git.zip.md5" />
-    <EmbeddedResource Include="PlatformResources\linux\gitconfig" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />