From 1b8b080e2477f8e698ce64f332f9a2f414e62159 Mon Sep 17 00:00:00 2001 From: Shorssaud Date: Thu, 16 Feb 2023 17:52:40 +0100 Subject: [PATCH] Add makefile --- Makefile | 9 ++++ tests/upload1_test.go | 97 +++++++++++++++++++++---------------------- 2 files changed, 57 insertions(+), 49 deletions(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ce4ad2c --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +# Create a makefile that runs all the tests in tests/ + +SRC = $(wildcard tests/*.go) + +all: + go test $(SRC) + +verbose: + go test -v $(SRC) \ No newline at end of file diff --git a/tests/upload1_test.go b/tests/upload1_test.go index d4098ba..bd62994 100644 --- a/tests/upload1_test.go +++ b/tests/upload1_test.go @@ -28,59 +28,58 @@ func TestUpload1(t *testing.T) { group, groupCtx := errgroup.WithContext(context.Background()) addrs := "127.0.0.1" for i, node := range nodes { + id := i node := node.Context(groupCtx) - if i <= 1 { - group.Go(func() error { - // gets node ip - ip, err := getIp(groupCtx, node) - if err != nil { - t.Error(Fatal("failed to get ip: %s", err)) - t.Error(Fatal("HOST EOutput: %s\n", ip)) - } - t.Log(Info("ip: " + ip)) + group.Go(func() error { + // gets node ip + ip, err := getIp(groupCtx, node) + if err != nil { + t.Error(Fatal("failed to get ip: %s", err)) + t.Error(Fatal("HOST EOutput: %s\n", ip)) + } + t.Log(Info("ip: " + ip)) - stdout := &bytes.Buffer{} - stderr := &bytes.Buffer{} + stdout := &bytes.Buffer{} + stderr := &bytes.Buffer{} - _, err = node.StartProc(cluster.StartProcRequest{ - Command: "./build/codex", - Args: []string{"--metrics", "--api-port=8090", "--data-dir=`pwd`/Codex1", "--disc-port=8070", "--log-level=TRACE"}, - Stdout: stdout, - }) - if err != nil { - t.Error(Fatal("HOST EOutput: %s\n", stderr.String())) - return err - } - runout := &bytes.Buffer{} - runerr := &bytes.Buffer{} - time.Sleep(2 * time.Second) - if i == 1 { - node.SendFile("tests/dog1.txt", bytes.NewBuffer([]byte("hello my dog"))) - for x := 0; x < 2; x++ { - group.Go(func() error { - proc, err := node.StartProc(cluster.StartProcRequest{ - Command: "curl", - Args: []string{"-vvv", "-H", "\"content-type: application/octet-stream\"", "-H", "Expect:", "-T", "tests/dog1.txt", "http://" + addrs + ":8090/api/codex/v1/upload", "-X", "POST"}, - Stdout: runout, - }) - if err != nil { - t.Error(Fatal("HOST EOutput: %s\n", err)) - return err - } - code, err := proc.Wait() - if err != nil { - t.Errorf(Fatal("HOST EOutput: %s\n", err)) - return err - } - t.Log(Info("HOST Output: ") + runout.String()) - assert.Equal(t, 0, code.ExitCode, "HOST EOutput: %s\n", runerr.String()) - return nil - }) - } - } - return nil + _, err = node.StartProc(cluster.StartProcRequest{ + Command: "./build/codex", + Args: []string{"--metrics", "--api-port=8090", "--data-dir=`pwd`/Codex1", "--disc-port=8070", "--log-level=TRACE"}, + Stdout: stdout, }) - } + if err != nil { + t.Error(Fatal("HOST EOutput: %s\n", stderr.String())) + return err + } + runout := &bytes.Buffer{} + runerr := &bytes.Buffer{} + time.Sleep(2 * time.Second) + + if id == 1 { + node.SendFile("tests/dog1.txt", bytes.NewBuffer([]byte("hello my dog"))) + for x := 0; x < 10; x++ { + group.Go(func() error { + proc, err := node.StartProc(cluster.StartProcRequest{ + Command: "curl", + Args: []string{"-vvv", "-H", "\"content-type: application/octet-stream\"", "-H", "Expect:", "-T", "tests/dog1.txt", "http://" + addrs + ":8090/api/codex/v1/upload", "-X", "POST"}, + Stdout: runout, + }) + if err != nil { + t.Error(Fatal("HOST EOutput: %s\n", err)) + return err + } + code, err := proc.Wait() + if err != nil { + t.Errorf(Fatal("HOST EOutput: %s\n", err)) + return err + } + assert.Equal(t, 0, code.ExitCode, "HOST EOutput: %s\n", runerr.String()) + return nil + }) + } + } + return nil + }) } group.Wait() })