adds tests

driver/docker/docker.go

@@ -43,6 +43,8 @@ type Signal string
 // SigHup is the SIGHUP signal.
 var SigHup Signal = "SIGHUP"
 var SigKill Signal = "SIGKILL"
+var SigInt Signal = "SIGINT"
+var Sigterm Signal = "SIGTERM"
 
 // Client provides means to spawn Docker containers capable of hosting
 // services like the go-opera client.
@@ -172,7 +174,7 @@ func (c *Client) Start(config *ContainerConfig) (*Container, error) {
 	}
 
 	init := true
-	stopTimeout := int(config.ShutdownTimeout.Seconds())
+	//stopTimeout := int(config.ShutdownTimeout.Seconds())
 	resp, err := c.cli.ContainerCreate(context.Background(), &container.Config{
 		Image:      config.ImageName,
 		Tty:        false,
@@ -181,7 +183,7 @@ func (c *Client) Start(config *ContainerConfig) (*Container, error) {
 		Labels: map[string]string{
 			objectsLabel: "true",
 		},
-		StopTimeout: &stopTimeout,
+		//StopTimeout: &stopTimeout,
 	}, &container.HostConfig{
 		PortBindings: portMapping,
 		Mounts:       mountConfig,
@@ -255,7 +257,8 @@ func (c *Container) Stop() error {
 	}
 	c.stopped = true
 	timeout := int(c.config.ShutdownTimeout.Seconds())
-	return c.client.cli.ContainerStop(context.Background(), c.id, container.StopOptions{Timeout: &timeout})
+	return c.client.cli.ContainerStop(context.Background(), c.id, container.StopOptions{
+		Signal: string(SigInt), Timeout: &timeout})
 }
 
 // Cleanup stops the container (unless it is already stopped) and frees any

driver/network/local/local_test.go

@@ -17,8 +17,11 @@
 package local
 
 import (
+	"bufio"
 	"fmt"
+	"strings"
 	"testing"
+	"time"
 
 	"github.com/Fantom-foundation/Norma/driver"
 	"go.uber.org/mock/gomock"
@@ -155,6 +158,67 @@ func TestLocalNetwork_CanPerformNetworkShutdown(t *testing.T) {
 	}
 }
 
+func TestLocalNetwork_Shutdown_Graceful(t *testing.T) {
+	t.Parallel()
+	N := 3
+	config := driver.NetworkConfig{NumberOfValidators: 1}
+
+	net, err := NewLocalNetwork(&config)
+	if err != nil {
+		t.Fatalf("failed to create new local network: %v", err)
+	}
+
+	done := make(chan bool, N)
+
+	ctrl := gomock.NewController(t)
+	listener := driver.NewMockNetworkListener(ctrl)
+	listener.EXPECT().AfterNodeCreation(gomock.Any()).DoAndReturn(func(node driver.Node) {
+		reader, err := node.StreamLog()
+		if err != nil {
+			t.Errorf("error: %v", err)
+		}
+		t.Cleanup(func() {
+			if err := reader.Close(); err != nil {
+				t.Errorf("cannot close: %v", err)
+			}
+		})
+
+		go func() {
+			scanner := bufio.NewScanner(reader)
+			for scanner.Scan() {
+				line := scanner.Text()
+				if strings.Contains(line, "State DB closed") {
+					done <- true
+				}
+			}
+		}()
+	}).Times(N)
+	net.RegisterListener(listener)
+
+	for i := 0; i < N; i++ {
+		_, err := net.CreateNode(&driver.NodeConfig{
+			Name: fmt.Sprintf("T-%d", i),
+		})
+		if err != nil {
+			t.Errorf("failed to create node: %v", err)
+		}
+	}
+
+	if err := net.Shutdown(); err != nil {
+		t.Errorf("failed to shut down network: %v", err)
+	}
+
+	// N containers must stop gracefully
+	for i := 0; i < N; i++ {
+		select {
+		case <-done:
+			// one container done successfully
+		case <-time.After(180 * time.Second):
+			t.Errorf("container did not stop gracefully")
+		}
+	}
+}
+
 func TestLocalNetwork_CanRunWithMultipleValidators(t *testing.T) {
 	t.Parallel()
 	for _, N := range []int{1, 3} {

driver/node/opera_test.go

@@ -182,3 +182,62 @@ func TestOperaNode_MetricsExposed(t *testing.T) {
 		t.Errorf("monitoring API has not been available")
 	}
 }
+
+func TestClient_Stop_Graceful(t *testing.T) {
+	t.Parallel()
+
+	client, err := docker.NewClient()
+	if err != nil {
+		t.Fatalf("failed to create client: %v", err)
+	}
+	defer func() {
+		if err := client.Close(); err != nil {
+			t.Errorf("cannot close: %v", err)
+		}
+	}()
+
+	node, err := StartOperaDockerNode(client, nil, &OperaNodeConfig{
+		Label:         "test",
+		NetworkConfig: &driver.NetworkConfig{NumberOfValidators: 1},
+	})
+	if err != nil {
+		t.Fatalf("failed to create client node: %v", err)
+	}
+	defer func() {
+		if err := node.Cleanup(); err != nil {
+			t.Errorf("cannot cleanup: %v", err)
+		}
+	}()
+
+	reader, err := node.StreamLog()
+	if err != nil {
+		t.Errorf("error: %v", err)
+	}
+	defer func() {
+		if err := reader.Close(); err != nil {
+			t.Errorf("cannot close: %v", err)
+		}
+	}()
+
+	done := make(chan bool)
+	go func() {
+		scanner := bufio.NewScanner(reader)
+		for scanner.Scan() {
+			line := scanner.Text()
+			if strings.Contains(line, "State DB closed") {
+				done <- true
+			}
+		}
+	}()
+
+	if err := node.Stop(); err != nil {
+		t.Errorf("cannot stop client node: %v", err)
+	}
+
+	select {
+	case <-done:
+		// container stopped gracefully
+	case <-time.After(180 * time.Second):
+		t.Errorf("container did not stop gracefully")
+	}
+}