enable dynamic repo tests

Author: arturcic

src/GitVersionCore.Tests/DynamicRepositoryTests.cs

@@ -1,18 +1,28 @@
-using System.Diagnostics;
 using System.IO;
 using GitVersion;
 using NUnit.Framework;
-using GitVersion.Helpers;
 using GitVersion.Log;
 
 namespace GitVersionCore.Tests
 {
     [TestFixture]
-    [Ignore("These tests are slow and fail on the second run in Test Explorer and need to be re-written")]
     public class DynamicRepositoryTests : TestBase
     {
         string workDirectory;
 
+        private void ClearReadOnly(DirectoryInfo parentDirectory)
+        {
+            if (parentDirectory == null) return;
+            parentDirectory.Attributes = FileAttributes.Normal;
+            foreach (var fi in parentDirectory.GetFiles())
+            {
+                fi.Attributes = FileAttributes.Normal;
+            }
+            foreach (var di in parentDirectory.GetDirectories())
+            {
+                ClearReadOnly(di);
+            }
+        }
 
         [OneTimeSetUp]
         public void CreateTemporaryRepository()
@@ -23,6 +33,9 @@ public void CreateTemporaryRepository()
             // Clean directory upfront, some build agents are having troubles
             if (Directory.Exists(workDirectory))
             {
+                var di = new DirectoryInfo(workDirectory);
+                ClearReadOnly(di);
+
                 Directory.Delete(workDirectory, true);
             }
 
@@ -43,8 +56,6 @@ public void Cleanup()
         [TestCase("Ctl_develop", "https://github.com/Catel/Catel", "develop", "0e2b6c125a730d2fa5e24394ef64abe62c98e9e9", "5.12.0-alpha.188")]
         [TestCase("Ctl_develop", "https://github.com/Catel/Catel", "develop", "71e71359f37581784e18c94e7a45eee72cbeeb30", "5.12.0-alpha.192")]
         [TestCase("Ctl_master", "https://github.com/Catel/Catel", "master", "f5de8964c35180a5f8607f5954007d5828aa849f", "5.10.0")]
-        [TestCase("CtlA_develop", "https://github.com/Catel/Catel.Analyzers", "develop", "be0aa94642d6ff1df6209e2180a7fe0de9aab384", "0.1.0-alpha.21")]
-        [TestCase("CtlA_develop", "https://github.com/Catel/Catel.Analyzers", "develop", "0e2b6c125a730d2fa5e24394ef64abe62c98e9e9", "0.1.0-alpha.23")]
         public void FindsVersionInDynamicRepo(string name, string url, string targetBranch, string commitId, string expectedFullSemVer)
         {
             var root = Path.Combine(workDirectory, name);
@@ -54,12 +65,6 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran
             Directory.CreateDirectory(dynamicDirectory);
             Directory.CreateDirectory(workingDirectory);
 
-            Logger.AddLoggersTemporarily(
-                x => Debug.WriteLine($"[DEBUG]   {x}"),
-                x => Debug.WriteLine($"[INFO]    {x}"),
-                x => Debug.WriteLine($"[WARNING] {x}"),
-                x => Debug.WriteLine($"[ERROR]   {x}"));
-
             var executeCore = new ExecuteCore(new TestFileSystem(), new TestEnvironment(), new NullLog());
 
             var versionVariables = executeCore.ExecuteGitVersion(url, dynamicDirectory, null, targetBranch,

src/GitVersionCore/Configuration/Config.cs

@@ -6,7 +6,6 @@
 using GitVersion.VersioningModes;
 using YamlDotNet.Serialization;
 using GitVersion.Extensions;
-using GitVersion.Helpers;
 
 namespace GitVersion.Configuration
 {
@@ -114,7 +113,8 @@ public BranchConfig GetConfigForBranch(string branchName)
                     .Select(kvp => kvp.Value)
                     .First();
 
-                Logger.Warning(
+                // TODO check how to log this
+                Console.WriteLine(
                     $"Multiple branch configurations match the current branch branchName of '{branchName}'. " +
                     $"Using the first matching configuration, '{picked}'. Matching configurations include: '{matchingConfigs}'");
 

src/GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text;
 using GitVersion.Configuration.Init.Wizard;
-using GitVersion.Helpers;
 using GitVersion.VersioningModes;
 using GitVersion.Extensions;
 using GitVersion.Common;
@@ -257,7 +256,7 @@ public static void Init(string workingDirectory, IFileSystem fileSystem, IConsol
             using (var stream = fileSystem.OpenWrite(configFilePath))
             using (var writer = new StreamWriter(stream))
             {
-                Logger.Info("Saving config file");
+                log.Info("Saving config file");
                 ConfigSerialiser.Write(config, writer);
                 stream.Flush();
             }

src/GitVersionCore/Extensions/VersionAssemblyInfoResources/AssemblyInfoFileUpdater.cs

@@ -3,7 +3,6 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-using GitVersion.Helpers;
 using GitVersion.OutputVariables;
 using GitVersion.Common;
 using GitVersion.Log;
@@ -197,7 +196,7 @@ private bool EnsureVersionAssemblyInfoFile(bool ensureAssemblyInfo, IFileSystem
                 return true;
             }
 
-            Logger.Warning($"No version assembly info template available to create source file '{fullPath}'");
+            log.Warning($"No version assembly info template available to create source file '{fullPath}'");
             return false;
         }
 

src/GitVersionCore/Helpers/Logger.cs

@@ -16,7 +16,7 @@ static Logger()
 
         private static Action<string> Debug { get; set; }
         public static Action<string> Info { get; private set; }
-        public static Action<string> Warning { get; private set; }
+        private static Action<string> Warning { get; set; }
         public static Action<string> Error { get; private set; }
 
         public static void SetLoggers(Action<string> debug, Action<string> info, Action<string> warn, Action<string> error)
@@ -32,39 +32,6 @@ public static void SetLoggers(Action<string> debug, Action<string> info, Action<
             Error = LogMessage(ObscurePassword(error), "ERROR");
         }
 
-        public static IDisposable AddLoggersTemporarily(Action<string> debug, Action<string> info, Action<string> warn, Action<string> error)
-        {
-            var currentDebug = Debug;
-            var currentInfo = Info;
-            var currentWarn = Warning;
-            var currentError = Error;
-            SetLoggers(s =>
-            {
-                debug(s);
-                currentDebug(s);
-            }, s =>
-            {
-                info(s);
-                currentInfo(s);
-            }, s =>
-            {
-                warn(s);
-                currentWarn(s);
-            }, s =>
-            {
-                error(s);
-                currentError(s);
-            });
-
-            return new ActionDisposable(() =>
-            {
-                Debug = currentDebug;
-                Info = currentInfo;
-                Warning =  currentWarn;
-                Error = currentError;
-            });
-        }
-
         private static Action<string> ObscurePassword(Action<string> info)
         {
             void LogAction(string s)
@@ -88,20 +55,5 @@ private static void Reset()
             Warning = s => throw new Exception("Warning logger not defined. Attempted to log: " + s);
             Error = s => throw new Exception("Error logger not defined. Attempted to log: " + s);
         }
-
-        private class ActionDisposable : IDisposable
-        {
-            private readonly Action action;
-
-            public ActionDisposable(Action action)
-            {
-                this.action = action;
-            }
-
-            public void Dispose()
-            {
-                action();
-            }
-        }
     }
 }

src/GitVersionCore/SemanticVersionPreReleaseTag.cs

@@ -95,7 +95,8 @@ public static SemanticVersionPreReleaseTag Parse(string preReleaseTag)
             var match = Regex.Match(preReleaseTag, @"(?<name>.*?)\.?(?<number>\d+)?$");
             if (!match.Success)
             {
-                Logger.Warning($"Unable to successfully parse semver tag {preReleaseTag}");
+                // TODO check how to log this
+                Console.WriteLine($"Unable to successfully parse semver tag {preReleaseTag}");
                 return new SemanticVersionPreReleaseTag();
             }