diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-12-22 03:11:08 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-22 03:11:08 -0800 |
commit | 792f10988ed2badcce9a11a880303614412b9a00 (patch) | |
tree | 96386ffcf059e1f5464db09e374e0cdc8a021430 /libpod/state_test.go | |
parent | 7122b49464519252a4f91ce1df337150ca24be42 (diff) | |
parent | c657dc4fdbca4b331d69e0910261e2cb11e2a629 (diff) | |
download | podman-792f10988ed2badcce9a11a880303614412b9a00.tar.gz podman-792f10988ed2badcce9a11a880303614412b9a00.tar.bz2 podman-792f10988ed2badcce9a11a880303614412b9a00.zip |
Merge pull request #2023 from rhatdan/config
Switch all references to image.ContainerConfig to image.Config
Diffstat (limited to 'libpod/state_test.go')
-rw-r--r-- | libpod/state_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libpod/state_test.go b/libpod/state_test.go index d93a371f3..708ce7d4e 100644 --- a/libpod/state_test.go +++ b/libpod/state_test.go @@ -152,7 +152,7 @@ func TestGetContainerPodSameIDFails(t *testing.T) { func TestAddInvalidContainerFails(t *testing.T) { runForAllStates(t, func(t *testing.T, state State, lockPath string) { - err := state.AddContainer(&Container{config: &ContainerConfig{ID: "1234"}}) + err := state.AddContainer(&Container{config: &Config{ID: "1234"}}) assert.Error(t, err) }) } @@ -752,7 +752,7 @@ func TestUpdateContainerNotInDatabaseReturnsError(t *testing.T) { func TestUpdateInvalidContainerReturnsError(t *testing.T) { runForAllStates(t, func(t *testing.T, state State, lockPath string) { - err := state.UpdateContainer(&Container{config: &ContainerConfig{ID: "1234"}}) + err := state.UpdateContainer(&Container{config: &Config{ID: "1234"}}) assert.Error(t, err) }) } @@ -776,7 +776,7 @@ func TestUpdateContainerNotInNamespaceReturnsError(t *testing.T) { func TestSaveInvalidContainerReturnsError(t *testing.T) { runForAllStates(t, func(t *testing.T, state State, lockPath string) { - err := state.SaveContainer(&Container{config: &ContainerConfig{ID: "1234"}}) + err := state.SaveContainer(&Container{config: &Config{ID: "1234"}}) assert.Error(t, err) }) } @@ -2600,7 +2600,7 @@ func TestAddContainerToPodInvalidCtr(t *testing.T) { err = state.AddPod(testPod) assert.NoError(t, err) - err = state.AddContainerToPod(testPod, &Container{config: &ContainerConfig{ID: "1234"}}) + err = state.AddContainerToPod(testPod, &Container{config: &Config{ID: "1234"}}) assert.Error(t, err) ctrs, err := state.PodContainersByID(testPod) |