From 010b0932583711ab3f6a88b1136cf8d87c2a53d2 Mon Sep 17 00:00:00 2001 From: Fabricio Voznika Date: Mon, 16 Sep 2019 08:15:40 -0700 Subject: Bring back to life features lost in recent refactor - Sandbox logs are generated when running tests - Kokoro uploads the sandbox logs - Supports multiple parallel runs - Revive script to install locally built runsc with docker PiperOrigin-RevId: 269337274 --- test/root/main_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'test/root') diff --git a/test/root/main_test.go b/test/root/main_test.go index a3a2a91d9..d74dec85f 100644 --- a/test/root/main_test.go +++ b/test/root/main_test.go @@ -29,13 +29,15 @@ import ( // supported docker version, required capabilities, and configures the executable // path for runsc. func TestMain(m *testing.M) { - dockerutil.EnsureSupportedDockerVersion() + flag.Parse() if !specutils.HasCapabilities(capability.CAP_SYS_ADMIN, capability.CAP_DAC_OVERRIDE) { fmt.Println("Test requires sysadmin privileges to run. Try again with sudo.") os.Exit(1) } + dockerutil.EnsureSupportedDockerVersion() + // Configure exe for tests. path, err := dockerutil.RuntimePath() if err != nil { @@ -43,6 +45,5 @@ func TestMain(m *testing.M) { } specutils.ExePath = path - flag.Parse() os.Exit(m.Run()) } -- cgit v1.2.3