Wait for the container to be removed

Signed-off-by: akram <akram@il.ibm.com>

Author: AkramBitar

platform/view/services/storage/driver/sql/postgres/binding_test.go

@@ -8,7 +8,6 @@ package postgres
 
 import (
 	"testing"
-	"time"
 
 	testing2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/driver/common/testing"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/driver/sql/common"
@@ -17,9 +16,6 @@ import (
 )
 
 func newBindingStoreForTests(t *testing.T) (func(), *BindingStore) {
-	// When running this test together with other tests; it may happen that a container instance is still running
-	// we give this test a slow start ...
-	time.Sleep(10 * time.Second)
 	t.Log("starting postgres")
 	terminate, pgConnStr, err := StartPostgres(t, false)
 	require.NoError(t, err)
@@ -34,16 +30,12 @@ func newBindingStoreForTests(t *testing.T) (func(), *BindingStore) {
 }
 
 func TestPutBindingsMultipleEphemeralsPostgres(t *testing.T) {
-	// if this test runs after another postgres test, wait a bit to let the previous connections close
-	time.Sleep(10 * time.Second)
 	terminate, db := newBindingStoreForTests(t)
 	defer terminate()
 	common.TestPutBindingsMultipleEphemeralsCommon(t, db.BindingStore)
 }
 
 func TestManyManyPutBindingsPostgres(t *testing.T) {
-	// if this test runs after another postgres test, wait a bit to let the previous connections close
-	time.Sleep(10 * time.Second)
 	terminate, db := newBindingStoreForTests(t)
 	defer terminate()
 	common.TestManyManyPutBindingsCommon(t, db.BindingStore)

platform/view/services/storage/driver/sql/postgres/test_utils.go

@@ -16,6 +16,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containerd/errdefs"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
@@ -196,6 +197,18 @@ func startPostgresWithLogger(c ContainerConfig, t Logger, printLogs bool) (func(
 	closeFunc := func() {
 		t.Log("removing postgres container")
 		_ = cli.ContainerRemove(ctx, resp.ID, container.RemoveOptions{RemoveVolumes: true, Force: true})
+		// Wait until the container is gone
+		for {
+			_, err := cli.ContainerInspect(ctx, resp.ID)
+			if err != nil {
+				if errdefs.IsNotFound(err) {
+					break // container fully removed
+				}
+				t.Log("unexpected error: %v", err)
+			}
+			time.Sleep(100 * time.Millisecond)
+		}
+		t.Log("container fully removed")
 	}
 	if err := cli.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {
 		closeFunc()

platform/view/services/storage/kvs/kvs_test.go

@@ -176,10 +176,6 @@ func TestSQLiteKVS(t *testing.T) {
 }
 
 func TestPostgresKVS(t *testing.T) {
-	// When running this test together with other tests; it may happen that a container instance is still running
-	// we give this test a slow start ...
-	time.Sleep(10 * time.Second)
-
 	t.Log("starting postgres")
 	terminate, pgConnStr, err := postgres2.StartPostgres(t, false)
 	if err != nil {