diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-27 17:22:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-27 17:22:48 +0200 |
| commit | a8c2b5dee4b746c2e83970603ff2645008d54b95 (patch) | |
| tree | 90a26ad83414e451a136cc542a9eb07ec5975173 /test | |
| parent | 92e1b661ff5fba140ba07dd2c956e5aede90e9b5 (diff) | |
| parent | 65b20bd521302020ff229d455c60102e15a41b8a (diff) | |
| download | podman-a8c2b5dee4b746c2e83970603ff2645008d54b95.tar.gz podman-a8c2b5dee4b746c2e83970603ff2645008d54b95.tar.bz2 podman-a8c2b5dee4b746c2e83970603ff2645008d54b95.zip | |
Merge pull request #4127 from nalind/reexec-use
Correct use of reexec.Init()
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/common_test.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 4e9881d59..1c2acf8ed 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -78,11 +78,15 @@ func (a testResultsSorted) Less(i, j int) bool { return a[i].length < a[j].lengt var testResults []testResult -// TestLibpod ginkgo master function -func TestLibpod(t *testing.T) { +func TestMain(m *testing.M) { if reexec.Init() { - os.Exit(1) + return } + os.Exit(m.Run()) +} + +// TestLibpod ginkgo master function +func TestLibpod(t *testing.T) { if os.Getenv("NOCACHE") == "1" { CACHE_IMAGES = []string{} RESTORE_IMAGES = []string{} |