Skip to content

Randomize errand job name during tests to avoid cgroup conflicts #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
beyhan merged 1 commit into from
Apr 24, 2025
Merged

Randomize errand job name during tests to avoid cgroup conflicts #179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 29 additions & 9 deletions src/bpm/integration2/run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"bytes"
"flag"
"fmt"
"math/rand"
"os"
"path/filepath"
"strings"
Expand All @@ -30,10 +31,20 @@ import (
"bpm/integration2/bpmsandbox"
)

const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"

var runcExe = flag.String("runcExe", "/var/vcap/packages/bpm/bin/runc", "path to the runc executable")
var tiniExe = flag.String("tiniExe", "/var/vcap/packages/bpm/bin/tini", "path to the tini executable")
var bpmExe = flag.String("bpmExe", "", "path to bpm executable")

func randomString(length int) string {
b := make([]byte, length)
for i := range b {
b[i] = charset[rand.Intn(len(charset))]
}
return string(b)
}

func TestMain(m *testing.M) {
flag.Parse()

Expand Down Expand Up @@ -61,11 +72,12 @@ func TestRun(t *testing.T) {
s := bpmsandbox.New(t)
defer s.Cleanup()

s.LoadFixture("errand", "testdata/errand.yml")
errandJob := generateJobName("errand")
s.LoadFixture(errandJob, "testdata/errand.yml")
stdoutSentinel := "stdout"
stderrSentinel := "stderr"

cmd := s.BPMCmd("run", "errand")
cmd := s.BPMCmd("run", errandJob, "-p", "errand")
output, err := cmd.CombinedOutput()
if err != nil {
t.Fatalf("failed to run bpm: %s", output)
Expand All @@ -79,7 +91,7 @@ func TestRun(t *testing.T) {
t.Errorf("stdout/stderr did not contain %q, contents: %q", stderrSentinel, combinedOutput)
}

stdout, err := os.ReadFile(s.Path("sys", "log", "errand", "errand.stdout.log"))
stdout, err := os.ReadFile(s.Path("sys", "log", errandJob, "errand.stdout.log"))
if err != nil {
t.Fatalf("failed to read stdout log: %v", err)
}
Expand All @@ -89,7 +101,7 @@ func TestRun(t *testing.T) {
t.Errorf("stdout log file did not contain %q, stdoutLog: %q", stdoutSentinel, stdoutLog)
}

stderr, err := os.ReadFile(s.Path("sys", "log", "errand", "errand.stderr.log"))
stderr, err := os.ReadFile(s.Path("sys", "log", errandJob, "errand.stderr.log"))
if err != nil {
t.Fatalf("failed to read stderr log: %v", err)
}
Expand All @@ -98,24 +110,30 @@ func TestRun(t *testing.T) {
t.Errorf("stderr log file did not contain %q, contents: %q", stderrSentinel, stderrLog)
}

pidfile := s.Path("sys", "run", "bpm", "errand", "errand.pid")
pidfile := s.Path("sys", "run", "bpm", errandJob, "errand.pid")
_, err = os.Stat(pidfile)
if !os.IsNotExist(err) {
t.Errorf("expected %q not to exist but it did", pidfile)
}
}

func generateJobName(prefix string) string {
return fmt.Sprintf("%s-%s", prefix, randomString(6))
}

func TestRunWithEnvFlags(t *testing.T) {
t.Parallel()
s := bpmsandbox.New(t)
defer s.Cleanup()

s.LoadFixture("errand", "testdata/env-flag.yml")
errandJob := generateJobName("errand")
s.LoadFixture(errandJob, "testdata/env-flag.yml")
sentinel := "sentinel"

cmd := s.BPMCmd(
"run",
"errand",
errandJob,
"-p", "errand",
"-e", fmt.Sprintf("ENVKEY=%s", sentinel),
)
output, err := cmd.CombinedOutput()
Expand All @@ -134,13 +152,15 @@ func TestRunWithVolumeFlags(t *testing.T) {
s := bpmsandbox.New(t)
defer s.Cleanup()

s.LoadFixture("errand", "testdata/volume-flag.yml")
errandJob := generateJobName("errand")
s.LoadFixture(errandJob, "testdata/volume-flag.yml")
extraVolumeDir := s.Path("data", "extra-volume")
extraVolumeFile := filepath.Join(extraVolumeDir, "data.txt")

cmd := s.BPMCmd(
"run",
"errand",
errandJob,
"-p", "errand",
"-v", fmt.Sprintf("%s:writable,allow_executions", extraVolumeDir),
"-e", fmt.Sprintf("FILE_TO_WRITE_TO=%s", extraVolumeFile),
)
Expand Down
Loading