Browse Source

Fix codecov test environment identification

pull/1606/head
James Jackson-South 5 years ago
parent
commit
c4d417ab66
  1. 20
      tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs

20
tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs

@ -24,10 +24,6 @@ namespace SixLabors.ImageSharp.Tests
private static readonly Lazy<string> SolutionDirectoryFullPathLazy = new Lazy<string>(GetSolutionDirectoryFullPathImpl); private static readonly Lazy<string> SolutionDirectoryFullPathLazy = new Lazy<string>(GetSolutionDirectoryFullPathImpl);
private static readonly Lazy<bool> RunsOnCiLazy = new Lazy<bool>(() => bool.TryParse(Environment.GetEnvironmentVariable("CI"), out bool isCi) && isCi);
private static readonly Lazy<bool> RunsWithCodeCoverageLazy = new Lazy<bool>(() => bool.TryParse(Environment.GetEnvironmentVariable("codecov"), out bool isCodeCov) && isCodeCov);
private static readonly Lazy<string> NetCoreVersionLazy = new Lazy<string>(GetNetCoreVersion); private static readonly Lazy<string> NetCoreVersionLazy = new Lazy<string>(GetNetCoreVersion);
static TestEnvironment() => PrepareRemoteExecutor(); static TestEnvironment() => PrepareRemoteExecutor();
@ -42,12 +38,20 @@ namespace SixLabors.ImageSharp.Tests
/// <summary> /// <summary>
/// Gets a value indicating whether test execution runs on CI. /// Gets a value indicating whether test execution runs on CI.
/// </summary> /// </summary>
internal static bool RunsOnCI => RunsOnCiLazy.Value; #if ENV_CI
internal static bool RunsOnCI => true;
#else
internal static bool RunsOnCI => false;
#endif
/// <summary> /// <summary>
/// Gets a value indicating whether test execution is running with code coverage testing enabled. /// Gets a value indicating whether test execution is running with code coverage testing enabled.
/// </summary> /// </summary>
internal static bool RunsWithCodeCoverage => RunsWithCodeCoverageLazy.Value; #if ENV_CODECOV
internal static bool RunsWithCodeCoverage => true;
#else
internal static bool RunsWithCodeCoverage => false;
#endif
internal static string SolutionDirectoryFullPath => SolutionDirectoryFullPathLazy.Value; internal static string SolutionDirectoryFullPath => SolutionDirectoryFullPathLazy.Value;
@ -66,14 +70,14 @@ namespace SixLabors.ImageSharp.Tests
} }
catch (Exception ex) catch (Exception ex)
{ {
throw new Exception( throw new DirectoryNotFoundException(
$"Unable to find ImageSharp solution directory from {TestAssemblyFile} because of {ex.GetType().Name}!", $"Unable to find ImageSharp solution directory from {TestAssemblyFile} because of {ex.GetType().Name}!",
ex); ex);
} }
if (directory == null) if (directory == null)
{ {
throw new Exception($"Unable to find ImageSharp solution directory from {TestAssemblyFile}!"); throw new DirectoryNotFoundException($"Unable to find ImageSharp solution directory from {TestAssemblyFile}!");
} }
} }

Loading…
Cancel
Save