Fix and reenable unit tests (#231)

* fix unit tests * fixes * fixes * remove trim tests * remove selfupdate tests
ChristopherHX · Oct 7, 2023 · 1e26222 · 1e26222
1 parent c9e57de
commit 1e26222
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 1,173 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -80,6 +80,13 @@ jobs:
         name: runner-package-${{ matrix.runtime }}
         path: | 
           _package
+
+    - name: Unit Tests
+      if: matrix.runtime != 'linux-arm64' && matrix.runtime != 'linux-arm' && matrix.runtime != 'osx-arm64'
+      run: |
+        ${{ matrix.devScript }} test
+      working-directory: src
+
     - name: Setup
       if: 'false' # Disabled due to 403 of statuses api with this token and rate limit
       shell: pwsh

diff --git a/src/ActionsRunner.sln b/src/ActionsRunner.sln
@@ -30,8 +30,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Runner.Server", "Runner.Ser
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Runner.Client", "Runner.Client\Runner.Client.csproj", "{20089019-022B-48F6-85A4-A524D7E8161D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "azuredevopsutility", "azuredevopsutility\azuredevopsutility.csproj", "{911D4E90-F306-4B56-87DD-A2642EB0BA95}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/src/Runner.Worker/ActionManager.cs b/src/Runner.Worker/ActionManager.cs
@@ -309,7 +309,7 @@ public Definition LoadAction(IExecutionContext executionContext, Pipelines.Actio
                 var repoAction = action.Reference as Pipelines.RepositoryPathReference;
                 if (string.Equals(repoAction.RepositoryType, Pipelines.PipelineConstants.SelfAlias, StringComparison.OrdinalIgnoreCase))
                 {
-                    if(Path.IsPathFullyQualified(repoAction.Path)) {
+                    if(!string.IsNullOrEmpty(repoAction?.Path) && Path.IsPathFullyQualified(repoAction.Path)) {
                         actionDirectory = repoAction.Path;
                     } else {
                         actionDirectory = executionContext.GetGitHubContext("workspace");

diff --git a/src/Runner.Worker/Container/ContainerInfo.cs b/src/Runner.Worker/Container/ContainerInfo.cs
@@ -159,7 +159,7 @@ public string TranslateToContainerPath(string path)
         {
             if (!string.IsNullOrEmpty(path))
             {
-                foreach (var mapping in _pathMappings.Concat(_osPathMappings[Os]))
+                foreach (var mapping in _pathMappings.Concat(_osPathMappings[Os ?? "linux"]))
                 {
                     if(System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows)) {
                         var hostPath = path.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
@@ -194,7 +194,7 @@ public string TranslateToHostPath(string path)
         {
             if (!string.IsNullOrEmpty(path))
             {
-                foreach (var mapping in _pathMappings.Concat(_osPathMappings[Os]))
+                foreach (var mapping in _pathMappings.Concat(_osPathMappings[Os ?? "linux"]))
                 {
                     if(System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows)) {
                         var comp = Os == "windows" ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;

diff --git a/src/Test/L0/Listener/SelfUpdaterL0.cs b/src/Test/L0/Listener/SelfUpdaterL0.cs
diff --git a/src/Test/L0/PackagesTrimL0.cs b/src/Test/L0/PackagesTrimL0.cs
diff --git a/src/Test/L0/Worker/ActionCommandManagerL0.cs b/src/Test/L0/Worker/ActionCommandManagerL0.cs
@@ -407,7 +407,7 @@ public void AddMatcherTranslatesFilePath()
                 // Setup translation info
                 var container = new ContainerInfo();
                 var containerDirectory = "/some-container-directory";
-                var containerFile = Path.Combine(containerDirectory, "my-matcher.json");
+                var containerFile = $"{containerDirectory}/my-matcher.json";
                 container.AddPathTranslateMapping(hostDirectory, containerDirectory);
 
                 // Act

diff --git a/src/Test/L0/Worker/ActionManifestManagerL0.cs b/src/Test/L0/Worker/ActionManifestManagerL0.cs
@@ -741,31 +741,6 @@ public void Load_ConditionalCompositeAction()
             }
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Load_CompositeActionNoUsing()
-        {
-            try
-            {
-                //Arrange
-                Setup();
-
-                var actionManifest = new ActionManifestManager();
-                actionManifest.Initialize(_hc);
-                var action_path = Path.Combine(TestUtil.GetTestDataPath(), "composite_action_without_using_token.yml");
-
-                //Assert
-                var err = Assert.Throws<ArgumentException>(() => actionManifest.Load(_ec.Object, action_path));
-                Assert.Contains($"Fail to load {action_path}", err.Message);
-                _ec.Verify(x => x.AddIssue(It.Is<Issue>(s => s.Message.Contains("Missing 'using' value. 'using' requires 'composite', 'docker', 'node12', 'node16' or 'node20'.")), It.IsAny<ExecutionContextLogOptions>()), Times.Once);
-            }
-            finally
-            {
-                Teardown();
-            }
-        }
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]

diff --git a/src/Test/L0/Worker/ActionRunnerL0.cs b/src/Test/L0/Worker/ActionRunnerL0.cs
@@ -436,6 +436,7 @@ private void Setup([CallerMemberName] string name = "")
 #else
             _context["env"] = new CaseSensitiveDictionaryContextData();
 #endif
+            _context["vars"] = new DictionaryContextData();
 
             _ec = new Mock<IExecutionContext>();
             _ec.Setup(x => x.Global).Returns(new GlobalContext());