Use make and docker-compose from the root folder

test/e2e_test.go

@@ -3,7 +3,6 @@ package test
 import (
 	"context"
 	"math/big"
-	"os/exec"
 	"testing"
 	"time"
 
@@ -20,15 +19,21 @@ func TestEthTransfer(t *testing.T) {
 	if testing.Short() {
 		t.Skip()
 	}
+
+	cluster, err := newTestCluster("")
+	require.NoError(t, err)
+
 	ctx := context.Background()
 	defer func() {
-		msg, err := exec.Command("make", "stop").CombinedOutput()
+		msg, err := cluster.stop()
 		require.NoError(t, err, string(msg))
+		require.NoError(t, cluster.reset())
 	}()
+
 	log.Info("restarting docker containers for the test")
-	msg, err := exec.Command("make", "stop").CombinedOutput()
+	msg, err := cluster.stop()
 	require.NoError(t, err, string(msg))
-	msg, err = exec.Command("make", "run").CombinedOutput()
+	msg, err = cluster.start()
 	require.NoError(t, err, string(msg))
 	time.Sleep(5 * time.Second)
 

test/test-cluster.go

@@ -0,0 +1,43 @@
+package test
+
+import (
+	"os"
+	"os/exec"
+	"path/filepath"
+)
+
+type testCluster struct {
+	path            string
+	originalWorkDir string
+}
+
+func newTestCluster(path string) (*testCluster, error) {
+	workDir, err := os.Getwd()
+	if err != nil {
+		return nil, err
+	}
+
+	if path == "" {
+		parentDir := filepath.Dir(workDir)
+		if err := os.Chdir(parentDir); err != nil {
+			return nil, err
+		}
+	}
+
+	return &testCluster{
+		path:            path,
+		originalWorkDir: workDir,
+	}, nil
+}
+
+func (t *testCluster) start() ([]byte, error) {
+	return exec.Command("make", "run-docker").CombinedOutput()
+}
+
+func (t *testCluster) stop() ([]byte, error) {
+	return exec.Command("make", "stop-docker").CombinedOutput()
+}
+
+func (t *testCluster) reset() error {
+	return os.Chdir(t.originalWorkDir)
+}