diff --git a/.github/workflows/old_tests.yml b/.github/workflows/old_tests.yml index 2b7cfdfd7..b3062aaee 100644 --- a/.github/workflows/old_tests.yml +++ b/.github/workflows/old_tests.yml @@ -37,6 +37,7 @@ jobs: - name: Run unit tests run: | make test + statediff-unit-test: name: Run state diff unit test @@ -121,7 +122,6 @@ jobs: run: | COUNT=0 ATTEMPTS=15 - sleep 30; docker logs local_go-ethereum_1 docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec go-ethereum ps aux until $(docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" cp go-ethereum:/root/transaction_info/STATEFUL_TEST_DEPLOYED_ADDRESS ./STATEFUL_TEST_DEPLOYED_ADDRESS) || [[ $COUNT -eq $ATTEMPTS ]]; do echo -e "$(( COUNT++ ))... \c"; sleep 10; done diff --git a/Jenkinsfile b/Jenkinsfile index 98b02490a..7ca6588e6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,6 +33,7 @@ pipeline { GOMODCACHE = "/tmp/go/pkg/mod" GOWORK="" //GOFLAGS="" + HOME="${WORKSPACE}" } steps { diff --git a/internal/flags/flags_test.go b/internal/flags/flags_test.go index 681586b46..04aaabdc8 100644 --- a/internal/flags/flags_test.go +++ b/internal/flags/flags_test.go @@ -23,14 +23,23 @@ import ( "testing" ) +func homeDir() string { + if home := os.Getenv("HOME"); home != "" { + return home + } + if usr, err := user.Current(); err == nil { + return usr.HomeDir + } + return "" +} + func TestPathExpansion(t *testing.T) { - user, _ := user.Current() var tests map[string]string if runtime.GOOS == "windows" { tests = map[string]string{ `/home/someuser/tmp`: `\home\someuser\tmp`, - `~/tmp`: user.HomeDir + `\tmp`, + `~/tmp`: homeDir() + `\tmp`, `~thisOtherUser/b/`: `~thisOtherUser\b`, `$DDDXXX/a/b`: `\tmp\a\b`, `/a/b/`: `\a\b`, @@ -41,7 +50,7 @@ func TestPathExpansion(t *testing.T) { } else { tests = map[string]string{ `/home/someuser/tmp`: `/home/someuser/tmp`, - `~/tmp`: user.HomeDir + `/tmp`, + `~/tmp`: homeDir() + `/tmp`, `~thisOtherUser/b/`: `~thisOtherUser/b`, `$DDDXXX/a/b`: `/tmp/a/b`, `/a/b/`: `/a/b`,