pkg/unshare: remove unreachable code from test

t.Fatal[f] stops the execution of the test case immediately, so anything that follows is unreachable code and has no effect. Remove it. Signed-off-by: Kir Kolyshkin <[email protected]>
containers · Sep 19, 2024 · 78b3787 · 78b3787
1 parent 1ac1730
commit 78b3787
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/pkg/unshare/unshare_test.go b/pkg/unshare/unshare_test.go
@@ -112,27 +112,22 @@ func TestUnshareNamespaces(t *testing.T) {
 		err := cmd.Run()
 		if err != nil {
 			t.Fatalf("run %q: %v: %s", name, err, buf.String())
-			break
 		}
 		if err = json.Unmarshal(buf.Bytes(), &report); err != nil {
 			t.Fatalf("error parsing results: %v", err)
-			break
 		}
 		for ns := range CloneFlags {
 			linkTarget, err := os.Readlink("/proc/self/ns/" + ns)
 			if err != nil {
 				t.Fatalf("Reading link /proc/self/ns/%s: %v", ns, err)
-				os.Exit(1)
 			}
 			if ns == name || ns == "user" { // we always create a new user namespace
 				if report.Namespaces[ns] == linkTarget {
 					t.Fatalf("child is still in our %q namespace", name)
-					os.Exit(1)
 				}
 			} else {
 				if report.Namespaces[ns] != linkTarget {
 					t.Fatalf("child is not in our %q namespace", name)
-					os.Exit(1)
 				}
 			}
 		}
@@ -150,11 +145,9 @@ func TestUnsharePgrp(t *testing.T) {
 		err := cmd.Run()
 		if err != nil {
 			t.Fatalf("run: %v: %s", err, buf.String())
-			break
 		}
 		if err = json.Unmarshal(buf.Bytes(), &report); err != nil {
 			t.Fatalf("error parsing results: %v", err)
-			break
 		}
 		if (report.Pgrp == syscall.Getpgrp()) != same {
 			t.Fatalf("expected %d == %d to be %v", report.Pgrp, syscall.Getpgrp(), same)
@@ -177,11 +170,9 @@ func TestUnshareSid(t *testing.T) {
 		err := cmd.Run()
 		if err != nil {
 			t.Fatalf("run: %v: %s", err, buf.String())
-			break
 		}
 		if err = json.Unmarshal(buf.Bytes(), &report); err != nil {
 			t.Fatalf("error parsing results: %v", err)
-			break
 		}
 		if (report.Sid == sid) != same {
 			t.Fatalf("expected %d == %d to be %v", report.Sid, sid, same)
@@ -200,11 +191,9 @@ func TestUnshareOOMScoreAdj(t *testing.T) {
 		err := cmd.Run()
 		if err != nil {
 			t.Fatalf("run: %v: %s", err, buf.String())
-			break
 		}
 		if err = json.Unmarshal(buf.Bytes(), &report); err != nil {
 			t.Fatalf("error parsing results: %v", err)
-			break
 		}
 		if report.OOMScoreAdj != adj {
 			t.Fatalf("saw oom_score_adj %d to be %v", adj, report.OOMScoreAdj)