Correct worker mutex sync primitive tests

Author: RainingComputers

pkg/runtimes/dupher/worker_test.go

@@ -490,32 +490,16 @@ func ChanParentFlowSpec() {
 			name:     "mutex",
 			flowName: "MutexParentFlow",
 			source: map[string]string{
-				"childmutexa.ds.go": `package main
+				"childmutex.ds.go": `package main
 
 import (
 	"github.com/RainingComputers/deepslate/prelude"
 	"sync"
 )
 
-func ChildMutexFlowASpec(mu sync.Mutex, ch chan int) {
+func ChildMutexFlowSpec(mu sync.Mutex, ch chan int) {
 	mu.Lock()
-	requestData, err := prelude.HttpListen("POST", "/mutex_child_a")
-	_ = err
-	_ = requestData
-	ch <- 1
-	mu.Unlock()
-}
-`,
-				"childmutexb.ds.go": `package main
-
-import (
-	"github.com/RainingComputers/deepslate/prelude"
-	"sync"
-)
-
-func ChildMutexFlowBSpec(mu sync.Mutex, ch chan int) {
-	mu.Lock()
-	requestData, err := prelude.HttpListen("POST", "/mutex_child_b")
+	requestData, err := prelude.HttpListen("POST", "/mutex_child")
 	_ = err
 	_ = requestData
 	ch <- 1
@@ -529,8 +513,8 @@ import "sync"
 func MutexParentFlowSpec() {
 	var mu sync.Mutex
 	ch := make(chan int)
-	go ChildMutexFlowASpec(mu, ch)
-	go ChildMutexFlowBSpec(mu, ch)
+	go ChildMutexFlowSpec(mu, ch)
+	go ChildMutexFlowSpec(mu, ch)
 	r1 := (<-ch)
 	r2 := (<-ch)
 	_ = r1
@@ -543,7 +527,7 @@ func MutexParentFlowSpec() {
 				{
 					request: &httpRequest{
 						method:     "POST",
-						path:       "/mutex_child_a",
+						path:       "/mutex_child",
 						body:       "{}",
 						wantStatus: 200,
 					},
@@ -552,7 +536,7 @@ func MutexParentFlowSpec() {
 				{
 					request: &httpRequest{
 						method:     "POST",
-						path:       "/mutex_child_b",
+						path:       "/mutex_child",
 						body:       "{}",
 						wantStatus: 200,
 					},

pkg/runtimes/dython/deepslate/tests/test_worker.py

@@ -442,31 +442,16 @@ async def chan_parent_flow() -> None:
             name="mutex",
             flow_name="mutex_parent_flow",
             source={
-                "child_mutex_flow_a.py": """\
+                "child_mutex_flow.py": """\
 from deepslate import dpslio
 from deepslate import flow, http_listen, DSError
 
 
 @flow
-async def child_mutex_flow_a(mu: dpslio.Lock, ch: dpslio.Queue[int]):
+async def child_mutex_flow(mu: dpslio.Lock, ch: dpslio.Queue[int]):
     await mu.acquire()
     request_data: bytes | DSError
-    request_data = http_listen("POST", "/mutex_child_a")
-    if not isinstance(request_data, bytes):
-        return request_data
-    await ch.put(1)
-    await mu.release()
-""",
-                "child_mutex_flow_b.py": """\
-from deepslate import dpslio
-from deepslate import flow, http_listen, DSError
-
-
-@flow
-async def child_mutex_flow_b(mu: dpslio.Lock, ch: dpslio.Queue[int]):
-    await mu.acquire()
-    request_data: bytes | DSError
-    request_data = http_listen("POST", "/mutex_child_b")
+    request_data = http_listen("POST", "/mutex_child")
     if not isinstance(request_data, bytes):
         return request_data
     await ch.put(1)
@@ -475,16 +460,15 @@ async def child_mutex_flow_b(mu: dpslio.Lock, ch: dpslio.Queue[int]):
                 "mutex_parent_flow.py": """\
 from deepslate import dpslio
 from deepslate import flow
-from .child_mutex_flow_a import child_mutex_flow_a
-from .child_mutex_flow_b import child_mutex_flow_b
+from .child_mutex_flow import child_mutex_flow
 
 
 @flow
 async def mutex_parent_flow() -> None:
     mu: dpslio.Lock = dpslio.Lock()
     ch: dpslio.Queue[int] = dpslio.Queue[int]()
-    dpslio.create_task(child_mutex_flow_a(mu, ch))
-    dpslio.create_task(child_mutex_flow_b(mu, ch))
+    dpslio.create_task(child_mutex_flow(mu, ch))
+    dpslio.create_task(child_mutex_flow(mu, ch))
     r1: int = await ch.get()
     r2: int = await ch.get()
 """,
@@ -495,15 +479,15 @@ async def mutex_parent_flow() -> None:
                 ),
                 WorkerTestStep(
                     request=HttpRequest(
-                        method="POST", path="/mutex_child_a", body="{}", want_status=200
+                        method="POST", path="/mutex_child", body="{}", want_status=200
                     ),
                 ),
                 WorkerTestStep(
                     sleep=3.0,
                 ),
                 WorkerTestStep(
                     request=HttpRequest(
-                        method="POST", path="/mutex_child_b", body="{}", want_status=200
+                        method="POST", path="/mutex_child", body="{}", want_status=200
                     ),
                 ),
                 WorkerTestStep(