fix tests on linux and run them in ci

ChristopherHX · Oct 15, 2023 · 7387dfe · 7387dfe
1 parent ff4d268
commit 7387dfe
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -81,11 +81,16 @@ jobs:
         path: | 
           _package
 
-    - name: Unit Tests
+    - name: Unit Tests (actions/runner)
       if: matrix.runtime != 'linux-arm64' && matrix.runtime != 'linux-arm' && matrix.runtime != 'osx-arm64'
       run: |
         ${{ matrix.devScript }} test
       working-directory: src
+
+    - name: Unit Tests (Sdk.Tests)
+      if: matrix.runtime != 'linux-arm64' && matrix.runtime != 'linux-arm' && matrix.runtime != 'osx-arm64'
+      run: |
+        dotnet test src/Sdk.Tests/Sdk.Tests.csproj
 
     - name: Setup
       if: 'false' # Disabled due to 403 of statuses api with this token and rate limit

diff --git a/src/Sdk.Tests/AzurePipelines/TestData/TestGenerator.cs b/src/Sdk.Tests/AzurePipelines/TestData/TestGenerator.cs
@@ -18,7 +18,7 @@ public static IEnumerable<TestWorkflow> ResolveWorkflows(string basePath, string
                 bool asPipeline = false;
 
                 // prioritize filtering pipeline*.yml files
-                var pipelines = files.Where(i => i.Contains("\\pipeline"));
+                var pipelines = files.Where(i => i.Contains($"{Path.DirectorySeparatorChar}pipeline"));
                 if (pipelines.Any())
                 {
                     asPipeline = true;

diff --git a/src/Sdk.Tests/AzurePipelines/Util/LocalFileProvider.cs b/src/Sdk.Tests/AzurePipelines/Util/LocalFileProvider.cs
@@ -18,9 +18,9 @@ public async Task<string> ReadFile(string repositoryAndRef, string path)
         #region Helper methods for local repositories
         public void AddRepo(string repositoryAndRef, string folderPath)
         {
-            if (!folderPath.EndsWith(@"\"))
+            if (!folderPath.EndsWith(Path.DirectorySeparatorChar))
             {
-                folderPath = $"{folderPath}\\";
+                folderPath = $"{folderPath}{Path.DirectorySeparatorChar}";
             }
             string repoName = repositoryAndRef.Split("@")[0];
             repos[repoName] = folderPath;