Merge pull request #977 from iotaledger/fix/dockertest-framework

Fix panic send on closed channel in DockerTestFramework
iotaledger · May 20, 2024 · 1f0661e · 1f0661e
2 parents f424ed4 + ab7a360
commit 1f0661e
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/tools/docker-network/tests/dockertestframework/framework.go b/tools/docker-network/tests/dockertestframework/framework.go
@@ -138,8 +138,11 @@ func (d *DockerTestFramework) Run() error {
 
 	ch := make(chan error)
 	stopCh := make(chan struct{})
-	defer close(ch)
-	defer close(stopCh)
+
+	defer func() {
+		close(stopCh)
+		close(ch)
+	}()
 
 	ts := time.Now()
 	go func() {
@@ -149,10 +152,14 @@ func (d *DockerTestFramework) Run() error {
 		select {
 		case <-stopCh:
 			return
+
 		default:
+			select {
+			case <-stopCh:
+				return
+			case ch <- err:
+			}
 		}
-
-		ch <- err
 	}()
 
 	timer := time.NewTimer(d.optsWaitForSync)