GitList

Browse code

Don't run tests twice

It's useless

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>

Djordje Lukic authored on 2023/09/19 18:37:55
Showing 3 changed files

integration/config/main_test.go index 4c62ec6..ebcb82d 100644
integration/network/macvlan/main_test.go index f26f89e..16651b3 100644
integration/plugin/common/main_test.go index b2af3e6..df896f1 100644

@@ -44,7 +44,7 @@ func TestMain(m *testing.M) {
 	}
 	span.End()
 	shutdown(ctx)
-	os.Exit(m.Run())
+	os.Exit(code)
 }
 
 func setupTest(t *testing.T) context.Context {

integration/network/macvlan/main_test.go

History View file @ d5425f2

@@ -50,5 +50,5 @@ func TestMain(m *testing.M) {
                      	span.SetAttributes(attribute.Int("exit", code))
                      	span.End()
                      	shutdown(ctx)
                     -	os.Exit(m.Run())
                     +	os.Exit(code)
+                     }

integration/plugin/common/main_test.go

History View file @ d5425f2

@@ -37,7 +37,7 @@ func TestMain(m *testing.M) {
 	}
 	span.SetAttributes(attribute.Int("exit", ec))
 	shutdown(ctx)
-	os.Exit(m.Run())
+	os.Exit(ec)
 }
 
 func setupTest(t *testing.T) context.Context {

...	...	@@ -44,7 +44,7 @@ func TestMain(m *testing.M) {
44	44	}
45	45	span.End()
46	46	shutdown(ctx)
47		- os.Exit(m.Run())
	47	+ os.Exit(code)
48	48	}
49	49
50	50	func setupTest(t *testing.T) context.Context {

...	...	@@ -37,7 +37,7 @@ func TestMain(m *testing.M) {
37	37	}
38	38	span.SetAttributes(attribute.Int("exit", ec))
39	39	shutdown(ctx)
40		- os.Exit(m.Run())
	40	+ os.Exit(ec)
41	41	}
42	42
43	43	func setupTest(t *testing.T) context.Context {