diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-08 18:00:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-08 18:00:11 +0200 |
commit | ed3acaecbfeead3b0fef5928e47ecc9f34cd8d5b (patch) | |
tree | 2ef0f0a0c9f3c2cd8798dee04de8c3d5ab292c36 /libpod/common_test.go | |
parent | 1055b22e9b900e5f4d41f39b506de4f2d1aa2f8e (diff) | |
parent | 1d36501f961889f554daf3c696fe95443ef211b6 (diff) | |
download | podman-ed3acaecbfeead3b0fef5928e47ecc9f34cd8d5b.tar.gz podman-ed3acaecbfeead3b0fef5928e47ecc9f34cd8d5b.tar.bz2 podman-ed3acaecbfeead3b0fef5928e47ecc9f34cd8d5b.zip |
Merge pull request #3496 from baude/golandcodeinspect
code cleanup
Diffstat (limited to 'libpod/common_test.go')
-rw-r--r-- | libpod/common_test.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libpod/common_test.go b/libpod/common_test.go index ae3cb1c87..93ca7bc71 100644 --- a/libpod/common_test.go +++ b/libpod/common_test.go @@ -89,13 +89,13 @@ func getTestContainer(id, name string, manager lock.Manager) (*Container, error) ctr.config.Labels["test"] = "testing" - // Allocate a lock for the container - lock, err := manager.AllocateLock() + // Allocate a containerLock for the container + containerLock, err := manager.AllocateLock() if err != nil { return nil, err } - ctr.lock = lock - ctr.config.LockID = lock.ID() + ctr.lock = containerLock + ctr.config.LockID = containerLock.ID() return ctr, nil } @@ -114,13 +114,13 @@ func getTestPod(id, name string, manager lock.Manager) (*Pod, error) { valid: true, } - // Allocate a lock for the pod - lock, err := manager.AllocateLock() + // Allocate a podLock for the pod + podLock, err := manager.AllocateLock() if err != nil { return nil, err } - pod.lock = lock - pod.config.LockID = lock.ID() + pod.lock = podLock + pod.config.LockID = podLock.ID() return pod, nil } |