containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2102 from kolyshkin/revive 

Assorted nits reported by revive linter
This commit is contained in:
openshift-merge-bot[bot] 2024-09-26 18:29:20 +00:00 committed by GitHub
parent 2f4e5321ac 78b3787397
commit 42fbe2d3e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/lockfile/lockfile.go
View File

@ -128,9 +128,8 @@ func GetROLockfile(path string) (Locker, error) {
func (l *LockFile) Lock() { func (l *LockFile) Lock() {
if l.ro { if l.ro {
panic("can't take write lock on read-only lock file") 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. // RLock locks the lockfile as a reader.
@ -142,9 +141,8 @@ func (l *LockFile) RLock() {
func (l *LockFile) TryLock() error { func (l *LockFile) TryLock() error {
if l.ro { if l.ro {
panic("can't take write lock on read-only lock file") 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. // TryRLock attempts to lock the lockfile as a reader.

11
pkg/unshare/unshare_test.go
View File

@ -111,27 +111,22 @@ func TestUnshareNamespaces(t *testing.T) {
err := cmd.Run() err := cmd.Run()
if err != nil { if err != nil {
t.Fatalf("run %q: %v: %s", name, err, buf.String()) t.Fatalf("run %q: %v: %s", name, err, buf.String())
break
} }
if err = json.Unmarshal(buf.Bytes(), &report); err != nil { if err = json.Unmarshal(buf.Bytes(), &report); err != nil {
t.Fatalf("error parsing results: %v", err) t.Fatalf("error parsing results: %v", err)
break
} }
for ns := range CloneFlags { for ns := range CloneFlags {
linkTarget, err := os.Readlink("/proc/self/ns/" + ns) linkTarget, err := os.Readlink("/proc/self/ns/" + ns)
if err != nil { if err != nil {
t.Fatalf("Reading link /proc/self/ns/%s: %v", ns, err) 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 ns == name || ns == "user" { // we always create a new user namespace
if report.Namespaces[ns] == linkTarget { if report.Namespaces[ns] == linkTarget {
t.Fatalf("child is still in our %q namespace", name) t.Fatalf("child is still in our %q namespace", name)
os.Exit(1)
} }
} else { } else {
if report.Namespaces[ns] != linkTarget { if report.Namespaces[ns] != linkTarget {
t.Fatalf("child is not in our %q namespace", name) t.Fatalf("child is not in our %q namespace", name)
os.Exit(1)
} }
} }
} }
@ -149,11 +144,9 @@ func TestUnsharePgrp(t *testing.T) {
err := cmd.Run() err := cmd.Run()
if err != nil { if err != nil {
t.Fatalf("run: %v: %s", err, buf.String()) t.Fatalf("run: %v: %s", err, buf.String())
break
} }
if err = json.Unmarshal(buf.Bytes(), &report); err != nil { if err = json.Unmarshal(buf.Bytes(), &report); err != nil {
t.Fatalf("error parsing results: %v", err) t.Fatalf("error parsing results: %v", err)
break
} }
if (report.Pgrp == syscall.Getpgrp()) != same { if (report.Pgrp == syscall.Getpgrp()) != same {
t.Fatalf("expected %d == %d to be %v", report.Pgrp, syscall.Getpgrp(), same) t.Fatalf("expected %d == %d to be %v", report.Pgrp, syscall.Getpgrp(), same)
@ -176,11 +169,9 @@ func TestUnshareSid(t *testing.T) {
err := cmd.Run() err := cmd.Run()
if err != nil { if err != nil {
t.Fatalf("run: %v: %s", err, buf.String()) t.Fatalf("run: %v: %s", err, buf.String())
break
} }
if err = json.Unmarshal(buf.Bytes(), &report); err != nil { if err = json.Unmarshal(buf.Bytes(), &report); err != nil {
t.Fatalf("error parsing results: %v", err) t.Fatalf("error parsing results: %v", err)
break
} }
if (report.Sid == sid) != same { if (report.Sid == sid) != same {
t.Fatalf("expected %d == %d to be %v", report.Sid, sid, same) t.Fatalf("expected %d == %d to be %v", report.Sid, sid, same)
@ -199,11 +190,9 @@ func TestUnshareOOMScoreAdj(t *testing.T) {
err := cmd.Run() err := cmd.Run()
if err != nil { if err != nil {
t.Fatalf("run: %v: %s", err, buf.String()) t.Fatalf("run: %v: %s", err, buf.String())
break
} }
if err = json.Unmarshal(buf.Bytes(), &report); err != nil { if err = json.Unmarshal(buf.Bytes(), &report); err != nil {
t.Fatalf("error parsing results: %v", err) t.Fatalf("error parsing results: %v", err)
break
} }
if report.OOMScoreAdj != adj { if report.OOMScoreAdj != adj {
t.Fatalf("saw oom_score_adj %d to be %v", adj, report.OOMScoreAdj) t.Fatalf("saw oom_score_adj %d to be %v", adj, report.OOMScoreAdj)