Fix tests that rely on having a git zip around

Since we aren't embedding the zips in the dll anymore, tests that rely on
them were trying to download things, and that causes timeouts. Embed
the zips in the test assembly so they're available for the tests, and
put them in place when starting up the test web server as well, so they
can be served for downloading tests.

Author: shana

src/GitHub.Api/GitHub.Api.csproj

@@ -280,8 +280,12 @@
     <Content Include="PlatformResources\windows\git.zip">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <EmbeddedResource Include="PlatformResources\mac\gitconfig" />
-    <EmbeddedResource Include="PlatformResources\windows\gitconfig" />
+    <EmbeddedResource Include="PlatformResources\mac\gitconfig">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="PlatformResources\windows\gitconfig">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\.gitattributes" />
@@ -296,6 +300,22 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
+    <Content Include="PlatformResources\linux\git-lfs.zip">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="PlatformResources\linux\git-lfs.zip.md5" />
+    <Content Include="PlatformResources\mac\git-lfs.zip.md5">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="PlatformResources\windows\git-lfs.zip.md5">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="PlatformResources\windows\git.zip.md5">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <EmbeddedResource Include="PlatformResources\linux\gitconfig">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

src/GitHub.Api/Helpers/AssemblyResources.cs

@@ -24,7 +24,11 @@ public static NPath ToFile(ResourceType resourceType, string resource, NPath des
             var type = resourceType == ResourceType.Icon ? "IconsAndLogos"
                 : resourceType == ResourceType.Platform ? "PlatformResources"
                 : "Resources";
-            var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(
+
+            var asm = Assembly.GetCallingAssembly();
+            if (!asm.FullName.StartsWith("IntegrationTests"))
+                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());

src/GitHub.Api/Installer/GitInstaller.cs

@@ -95,18 +95,29 @@ private GitInstallationState VerifyGitInstallation()
             }
             else
                 Logger.Trace($"{installDetails.GitLfsExecutablePath} does not exist");
+
+            if (!state.GitZipExists)
+                Logger.Trace($"{installDetails.GitZipPath} does not exist");
+            if (!state.GitLfsZipExists)
+                Logger.Trace($"{installDetails.GitLfsZipPath} does not exist");
             installationTask.UpdateProgress(10, 100);
             return state;
         }
 
         private GitInstallationState GrabZipFromResources(GitInstallationState state)
         {
             if (!state.GitZipExists)
+            {
                 AssemblyResources.ToFile(ResourceType.Platform, "git.zip", installDetails.ZipPath, environment);
+                AssemblyResources.ToFile(ResourceType.Platform, "git.zip.md5", installDetails.ZipPath, environment);
+            }
             state.GitZipExists = installDetails.GitZipPath.FileExists();
 
             if (!state.GitLfsZipExists)
+            {
                 AssemblyResources.ToFile(ResourceType.Platform, "git-lfs.zip", installDetails.ZipPath, environment);
+                AssemblyResources.ToFile(ResourceType.Platform, "git-lfs.zip.md5", installDetails.ZipPath, environment);
+            }
             state.GitLfsZipExists = installDetails.GitLfsZipPath.FileExists();
             installationTask.UpdateProgress(20, 100);
             return state;
@@ -195,9 +206,9 @@ class GitInstallationState
 
         public class GitInstallDetails
         {
-            public const string DefaultGitZipMd5Url = "https://ghfvs-installer.github.com/unity/portable_git/git.zip.MD5.txt";
+            public const string DefaultGitZipMd5Url = "https://ghfvs-installer.github.com/unity/portable_git/git.zip.md5";
             public const string DefaultGitZipUrl = "https://ghfvs-installer.github.com/unity/portable_git/git.zip";
-            public const string DefaultGitLfsZipMd5Url = "https://ghfvs-installer.github.com/unity/portable_git/git-lfs.zip.MD5.txt";
+            public const string DefaultGitLfsZipMd5Url = "https://ghfvs-installer.github.com/unity/portable_git/git-lfs.zip.md5";
             public const string DefaultGitLfsZipUrl = "https://ghfvs-installer.github.com/unity/portable_git/git-lfs.zip";
 
             public const string GitExtractedMD5 = "e6cfc0c294a2312042f27f893dfc9c0a";

src/GitHub.Api/PlatformResources/linux/git-lfs.zip.md5

@@ -0,0 +1 @@
+3cde251dc13fe09ef62a2a2227fcc310

src/GitHub.Api/PlatformResources/linux/gitconfig

@@ -0,0 +1,18 @@
+[core]
+	symlinks = false
+	autocrlf = true
+[color]
+	diff = auto
+	status = auto
+	branch = auto
+	interactive = true
+[pack]
+	packSizeLimit = 2g
+[help]
+	format = html
+[http]
+	sslCAinfo = /ssl/certs/ca-bundle.crt
+[diff "astextplain"]
+	textconv = astextplain
+[rebase]
+	autosquash = true

src/GitHub.Api/PlatformResources/mac/git-lfs.zip.md5

@@ -0,0 +1 @@
+fb5862c66d8d53ba4eb9599419dffa1f

src/GitHub.Api/PlatformResources/windows/git-lfs.zip.md5

@@ -0,0 +1 @@
+105df1302560c5f6aa64d1930284c126

src/GitHub.Api/PlatformResources/windows/git.zip.md5

@@ -0,0 +1 @@
+ea5d5a38a6b9e9bc2b10011602c65a0d

src/tests/IntegrationTests/BaseGitEnvironmentTest.cs

@@ -7,9 +7,8 @@ class BaseGitEnvironmentTest : BaseIntegrationTest
         public override void OnSetup()
         {
             base.OnSetup();
-            Logger.Trace("Extracting Zip File to {0}", TestBasePath);
+            Logger.Trace($"Extracting {TestZipFilePath} to {TestBasePath}");
             ZipHelper.ExtractZipFile(TestZipFilePath, TestBasePath.ToString(), TaskManager.Token, (value, total) => true);
-            Logger.Trace("Extracted Zip File");
         }
 
         public override void OnTearDown()

src/tests/IntegrationTests/BaseIntegrationTest.cs

@@ -1,11 +1,13 @@
 using System;
+using System.Diagnostics;
 using NUnit.Framework;
 using GitHub.Unity;
 using NCrunch.Framework;
 using System.Threading;
 using GitHub.Logging;
 using System.Linq;
 using System.IO;
+using System.Runtime.CompilerServices;
 
 namespace IntegrationTests
 {
@@ -78,18 +80,19 @@ protected void InitializeEnvironment(NPath repoPath = null,
                 initializeRepository);
         }
 
-        protected void InitializePlatform(NPath repoPath, NPath environmentPath, bool enableEnvironmentTrace, bool initializeRepository = true, bool setupGit = true)
+        private void InitializePlatform(NPath repoPath, NPath environmentPath, bool enableEnvironmentTrace,
+            bool setupGit = true, string testName = "")
         {
             InitializeTaskManager();
-            InitializeEnvironment(repoPath, environmentPath, enableEnvironmentTrace, initializeRepository);
+            InitializeEnvironment(repoPath, environmentPath, enableEnvironmentTrace, true);
 
             Platform = new Platform(Environment);
             ProcessManager = new ProcessManager(Environment, GitEnvironment, TaskManager.Token);
 
             Platform.Initialize(ProcessManager, TaskManager);
 
             if (setupGit)
-                SetupGit(Environment.GetSpecialFolder(System.Environment.SpecialFolder.LocalApplicationData).ToNPath());
+                SetupGit(Environment.GetSpecialFolder(System.Environment.SpecialFolder.LocalApplicationData).ToNPath(), testName);
         }
 
         protected void InitializeTaskManager()
@@ -103,9 +106,10 @@ protected IEnvironment InitializePlatformAndEnvironment(NPath repoPath,
             NPath environmentPath = null,
             bool enableEnvironmentTrace = false,
             bool setupGit = true,
-            Action<IRepositoryManager> onRepositoryManagerCreated = null)
+            Action<IRepositoryManager> onRepositoryManagerCreated = null,
+            [CallerMemberName] string testName = "")
         {
-            InitializePlatform(repoPath, environmentPath, enableEnvironmentTrace, setupGit);
+            InitializePlatform(repoPath, environmentPath, enableEnvironmentTrace, setupGit, testName);
 
             DotGitPath = repoPath.Combine(".git");
 
@@ -133,15 +137,20 @@ protected IEnvironment InitializePlatformAndEnvironment(NPath repoPath,
             return Environment;
         }
 
-        protected void SetupGit(NPath pathToSetupGitInto)
+        protected void SetupGit(NPath pathToSetupGitInto, string testName)
         {
             var autoResetEvent = new AutoResetEvent(false);
 
             var installDetails = new GitInstaller.GitInstallDetails(pathToSetupGitInto, true);
 
             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, TaskManager.Token, installDetails);
 
@@ -155,7 +164,8 @@ protected void SetupGit(NPath pathToSetupGitInto)
                 autoResetEvent.Set();
             };
 
-            autoResetEvent.WaitOne();
+            if (!autoResetEvent.WaitOne(TimeSpan.FromMinutes(1)))
+                throw new TimeoutException($"Test setup unzipping {zipArchivesPath} to {pathToSetupGitInto} timed out");
 
             if (result == null)
             {
@@ -220,5 +230,31 @@ public virtual void OnTearDown()
 
             NPath.FileSystem = null;
         }
+
+        protected void StartTest(out Stopwatch watch, out ILogging logger, [CallerMemberName] string testName = "test")
+        {
+            watch = new Stopwatch();
+            logger = LogHelper.GetLogger(testName);
+            logger.Trace("Starting test");
+        }
+
+        protected void EndTest(ILogging logger)
+        {
+            logger.Trace("Ending test");
+        }
+
+        protected void StartTrackTime(Stopwatch watch, ILogging logger = null, string message = "")
+        {
+            if (!String.IsNullOrEmpty(message))
+                logger.Trace(message);
+            watch.Reset();
+            watch.Start();
+        }
+
+        protected void StopTrackTimeAndLog(Stopwatch watch, ILogging logger)
+        {
+            watch.Stop();
+            logger.Trace($"Time: {watch.ElapsedMilliseconds}");
+        }
     }
 }