opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-22 01:27:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix gofmt and lint

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #184
Approved by: baude
This commit is contained in:
Matthew Heon
2018-02-10 14:27:04 -05:00
committed by Atomic Bot
parent a7889f8d6a
commit 3962d10bd4
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/boltdb_state_internal.go
View File

@ -23,8 +23,6 @@ const (
dependenciesName = "dependencies" dependenciesName = "dependencies"
netNSName = "netns" netNSName = "netns"
containersName = "containers" containersName = "containers"
dbExistName = "ok"
) )
var ( var (

16
libpod/state_test.go
View File

@ -1073,7 +1073,7 @@ func TestHasPodCtrIDFalse(t *testing.T) {
func TestAddPodInvalidPodErrors(t *testing.T) { func TestAddPodInvalidPodErrors(t *testing.T) {
runForAllStates(t, func(t *testing.T, state State, lockPath string) { runForAllStates(t, func(t *testing.T, state State, lockPath string) {
err := state.AddPod(&Pod{config: &PodConfig{},}) err := state.AddPod(&Pod{config: &PodConfig{}})
assert.Error(t, err) assert.Error(t, err)
}) })
} }
@ -1197,7 +1197,7 @@ func TestAddPodCtrNameConflictFails(t *testing.T) {
func TestRemovePodInvalidPodErrors(t *testing.T) { func TestRemovePodInvalidPodErrors(t *testing.T) {
runForAllStates(t, func(t *testing.T, state State, lockPath string) { runForAllStates(t, func(t *testing.T, state State, lockPath string) {
err := state.RemovePod(&Pod{config: &PodConfig{},}) err := state.RemovePod(&Pod{config: &PodConfig{}})
assert.Error(t, err) assert.Error(t, err)
}) })
} }
@ -1372,7 +1372,7 @@ func TestAllPodsMultiplePods(t *testing.T) {
func TestPodHasContainerNoSuchPod(t *testing.T) { func TestPodHasContainerNoSuchPod(t *testing.T) {
runForAllStates(t, func(t *testing.T, state State, lockPath string) { runForAllStates(t, func(t *testing.T, state State, lockPath string) {
_, err := state.PodHasContainer(&Pod{config: &PodConfig{},}, strings.Repeat("0", 32)) _, err := state.PodHasContainer(&Pod{config: &PodConfig{}}, strings.Repeat("0", 32))
assert.Error(t, err) assert.Error(t, err)
}) })
} }
@ -1448,7 +1448,7 @@ func TestPodHasContainerSucceeds(t *testing.T) {
func TestPodContainersByIDInvalidPod(t *testing.T) { func TestPodContainersByIDInvalidPod(t *testing.T) {
runForAllStates(t, func(t *testing.T, state State, lockPath string) { runForAllStates(t, func(t *testing.T, state State, lockPath string) {
_, err := state.PodContainersByID(&Pod{config: &PodConfig{},}) _, err := state.PodContainersByID(&Pod{config: &PodConfig{}})
assert.Error(t, err) assert.Error(t, err)
}) })
} }
@ -1550,7 +1550,7 @@ func TestPodContainersByIDMultipleContainers(t *testing.T) {
func TestPodContainersInvalidPod(t *testing.T) { func TestPodContainersInvalidPod(t *testing.T) {
runForAllStates(t, func(t *testing.T, state State, lockPath string) { runForAllStates(t, func(t *testing.T, state State, lockPath string) {
_, err := state.PodContainers(&Pod{config: &PodConfig{},}) _, err := state.PodContainers(&Pod{config: &PodConfig{}})
assert.Error(t, err) assert.Error(t, err)
}) })
} }
@ -1657,7 +1657,7 @@ func TestPodContainersMultipleContainers(t *testing.T) {
func TestRemovePodContainersInvalidPod(t *testing.T) { func TestRemovePodContainersInvalidPod(t *testing.T) {
runForAllStates(t, func(t *testing.T, state State, lockPath string) { runForAllStates(t, func(t *testing.T, state State, lockPath string) {
err := state.RemovePodContainers(&Pod{config: &PodConfig{},}) err := state.RemovePodContainers(&Pod{config: &PodConfig{}})
assert.Error(t, err) assert.Error(t, err)
}) })
} }
@ -1848,7 +1848,7 @@ func TestAddContainerToPodInvalidPod(t *testing.T) {
testCtr, err := getTestCtr1(lockPath) testCtr, err := getTestCtr1(lockPath)
assert.NoError(t, err) assert.NoError(t, err)
err = state.AddContainerToPod(&Pod{config: &PodConfig{},}, testCtr) err = state.AddContainerToPod(&Pod{config: &PodConfig{}}, testCtr)
assert.Error(t, err) assert.Error(t, err)
}) })
} }
@ -2179,7 +2179,7 @@ func TestRemoveContainerFromPodBadPodFails(t *testing.T) {
testCtr, err := getTestCtr1(lockPath) testCtr, err := getTestCtr1(lockPath)
assert.NoError(t, err) assert.NoError(t, err)
err = state.RemoveContainerFromPod(&Pod{config: &PodConfig{},}, testCtr) err = state.RemoveContainerFromPod(&Pod{config: &PodConfig{}}, testCtr)
assert.Error(t, err) assert.Error(t, err)
}) })
} }

6
libpod/test_common.go
View File

@ -78,11 +78,11 @@ func getTestContainer(id, name, locksDir string) (*Container, error) {
func getTestPod(id, name, locksDir string) (*Pod, error) { func getTestPod(id, name, locksDir string) (*Pod, error) {
pod := &Pod{ pod := &Pod{
config: &PodConfig{ config: &PodConfig{
ID: id, ID: id,
Name: name, Name: name,
Labels: map[string]string{"a": "b", "c": "d"}, Labels: map[string]string{"a": "b", "c": "d"},
}, },
valid: true, valid: true,
} }
lockPath := filepath.Join(locksDir, id) lockPath := filepath.Join(locksDir, id)