expose DiffRunner.Disabled

and dont launch by default for CI or continuous testing
VerifyTests · Jul 12, 2020 · 2d02206 · 2d02206
1 parent 1ea892c
commit 2d02206
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/src/DiffEngine/DiffRunner.cs b/src/DiffEngine/DiffRunner.cs
@@ -12,12 +12,19 @@ public static class DiffRunner
     {
         static int maxInstancesToLaunch = 5;
         static int launchedInstances;
-        internal static bool disabled;
+        public static bool Disabled { get; set; }
 
         static DiffRunner()
+        {
+            Disabled = IsDisableByEnv() ||
+                       BuildServerDetector.Detected ||
+                       ContinuousTestingDetector.Detected;
+        }
+
+        static bool IsDisableByEnv()
         {
             var disabledVariable = Environment.GetEnvironmentVariable("DiffEngine.Disabled");
-            disabled = string.Equals(disabledVariable, "true", StringComparison.OrdinalIgnoreCase);
+            return string.Equals(disabledVariable, "true", StringComparison.OrdinalIgnoreCase);
         }
 
         public static void MaxInstancesToLaunch(int value)
@@ -31,7 +38,7 @@ public static void MaxInstancesToLaunch(int value)
         /// </summary>
         public static void Kill(string tempFile, string targetFile)
         {
-            if (disabled)
+            if (Disabled)
             {
                 return;
             }
@@ -58,7 +65,7 @@ public static LaunchResult Launch(DiffTool tool, string tempFile, string targetF
         {
             GuardFiles(tempFile, targetFile);
 
-            if (disabled)
+            if (Disabled)
             {
                 return LaunchResult.Disabled;
             }
@@ -77,7 +84,7 @@ public static LaunchResult Launch(DiffTool tool, string tempFile, string targetF
         public static LaunchResult Launch(string tempFile, string targetFile)
         {
             GuardFiles(tempFile, targetFile);
-            if (disabled)
+            if (Disabled)
             {
                 return LaunchResult.Disabled;
             }
@@ -96,7 +103,7 @@ public static LaunchResult Launch(ResolvedTool tool, string tempFile, string tar
         {
             GuardFiles(tempFile, targetFile);
             Guard.AgainstNull(tool, nameof(tool));
-            if (disabled)
+            if (Disabled)
             {
                 return LaunchResult.Disabled;
             }

diff --git a/src/DiffEngine/DiffTools.cs b/src/DiffEngine/DiffTools.cs
@@ -13,7 +13,8 @@ public static class DiffTools
 
         public static IEnumerable<ResolvedTool> Resolved { get => resolved; }
 
-        public static ResolvedTool? AddTool(string name,
+        public static ResolvedTool? AddTool(
+            string name,
             bool autoRefresh,
             bool isMdi,
             bool supportsText,

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649</NoWarn>
-    <Version>4.1.0</Version>
+    <Version>4.2.0</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>Json, Testing, Verify, Snapshot, Approvals</PackageTags>
     <Description>Enables simple verification of complex models and documents.</Description>

diff --git a/src/Tests/DiffRunnerTests.cs b/src/Tests/DiffRunnerTests.cs
@@ -36,7 +36,7 @@ public void Kill()
     [Fact]
     public void LaunchAndKillDisabled()
     {
-        DiffRunner.disabled = true;
+        DiffRunner.Disabled = true;
         try
         {
             Assert.False(IsRunning());
@@ -55,7 +55,7 @@ public void LaunchAndKillDisabled()
         }
         finally
         {
-            DiffRunner.disabled = false;
+            DiffRunner.Disabled = false;
         }
     }
 

diff --git a/src/Tests/GlobalSetup.cs b/src/Tests/GlobalSetup.cs
@@ -7,5 +7,6 @@ public static class GlobalSetup
     public static void Setup()
     {
         Logging.Enable();
+        DiffRunner.Disabled = false;
     }
 }