Exclude example workers from tests

conductor-sdk · Dec 5, 2024 · 8751793 · 8751793
1 parent 27201d3
commit 8751793
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -20,7 +20,7 @@ ENV CONDUCTOR_SERVER_URL=${CONDUCTOR_SERVER_URL}
 COPY /csharp-examples /package/csharp-examples
 COPY /Tests /package/Tests
 WORKDIR /package/Tests
-RUN dotnet test -l "console;verbosity=normal"
+RUN dotnet test -p:DefineConstants=EXCLUDE_EXAMPLE_WORKERS  -l "console;verbosity=normal"
 
 FROM build as pack_release
 ARG SDK_VERSION

diff --git a/Tests/Worker/WorkerTests.cs b/Tests/Worker/WorkerTests.cs
@@ -47,7 +47,7 @@ public async System.Threading.Tasks.Task TestWorkflowAsyncExecution()
             var workflow = GetConductorWorkflow();
             ApiExtensions.GetWorkflowExecutor().RegisterWorkflow(workflow, true);
             var workflowIdList = await StartWorkflows(workflow, quantity: 15);
-            await ExecuteWorkflowTasks(workflowCompletionTimeout: TimeSpan.FromSeconds(40));
+            await ExecuteWorkflowTasks(workflowCompletionTimeout: TimeSpan.FromSeconds(30));
             await ValidateWorkflowCompletion(workflowIdList.ToArray());
         }
 

diff --git a/...xamples/Examples/Utils/ReRunWorkflow.json → csharp-examples/Utils/ReRunWorkflow.json b/...xamples/Examples/Utils/ReRunWorkflow.json → csharp-examples/Utils/ReRunWorkflow.json
diff --git a/csharp-examples/Examples/Utils/WorkerUtil.cs → csharp-examples/Utils/WorkerUtil.cs b/csharp-examples/Examples/Utils/WorkerUtil.cs → csharp-examples/Utils/WorkerUtil.cs
@@ -12,9 +12,6 @@
  */
 using Conductor.Client.Extensions;
 using Conductor.Client.Interfaces;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Conductor.Examples.Utils
 {
@@ -32,7 +29,7 @@ public static async Task<bool> StartBackGroundTask(ManualResetEvent waitHandle,
             {
                 var host = WorkflowTaskHost.CreateWorkerHost(Microsoft.Extensions.Logging.LogLevel.Information);
                 await host.StartAsync();
-                Thread.Sleep(60000);
+                Thread.Sleep(40000);
                 waitHandle.Set();
                 await host.StopAsync();
                 return true;

diff --git a/csharp-examples/csharp-examples.csproj b/csharp-examples/csharp-examples.csproj
@@ -10,11 +10,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets"
+      Version="1.19.5" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="../Conductor/conductor-csharp.csproj" />
   </ItemGroup>
+  <ItemGroup Condition="'$(DefineConstants)' == 'EXCLUDE_EXAMPLE_WORKERS'">
+    <Compile Remove="Examples/**/*.cs" />
+    <Compile Remove="WorkflowExamples.cs" />
+  </ItemGroup>
 
 </Project>