From 1ac1730a90726c463d87449f3a73ce9acb8921d2 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 19 Sep 2024 16:17:16 -0700 Subject: [PATCH 1/2] pkg/lockfile: no else needed after panic Signed-off-by: Kir Kolyshkin --- pkg/lockfile/lockfile.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/lockfile/lockfile.go b/pkg/lockfile/lockfile.go index 25a71ac908..52f6c0a62c 100644 --- a/pkg/lockfile/lockfile.go +++ b/pkg/lockfile/lockfile.go @@ -128,9 +128,8 @@ func GetROLockfile(path string) (Locker, error) { func (l *LockFile) Lock() { if l.ro { panic("can't take write lock on read-only lock file") - } else { - l.lock(writeLock) } + l.lock(writeLock) } // RLock locks the lockfile as a reader. @@ -142,9 +141,8 @@ func (l *LockFile) RLock() { func (l *LockFile) TryLock() error { if l.ro { panic("can't take write lock on read-only lock file") - } else { - return l.tryLock(writeLock) } + return l.tryLock(writeLock) } // TryRLock attempts to lock the lockfile as a reader. From 78b378739728b793e30820195f2a809f69f2a2a5 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 19 Sep 2024 16:20:26 -0700 Subject: [PATCH 2/2] 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 --- pkg/unshare/unshare_test.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkg/unshare/unshare_test.go b/pkg/unshare/unshare_test.go index f3e3db013e..0670d59933 100644 --- 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)