summaryrefslogtreecommitdiff
path: root/libpod/state_test.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-01-08 07:06:09 -0800
committerGitHub <noreply@github.com>2019-01-08 07:06:09 -0800
commit9474b8cea239348d11c913b03b9461afaf663f0b (patch)
tree6bc89d8f2881c0eeb4df5d24b938c69008d8dce9 /libpod/state_test.go
parent4f19f1afcaa67f8e775e303b1b6627fb5abd9116 (diff)
parent5ed23327a9e68219f6d1eaf38e0533e732438eb5 (diff)
downloadpodman-9474b8cea239348d11c913b03b9461afaf663f0b.tar.gz
podman-9474b8cea239348d11c913b03b9461afaf663f0b.tar.bz2
podman-9474b8cea239348d11c913b03b9461afaf663f0b.zip
Merge pull request #2099 from mheon/config_to_containerconfig
Rename libpod.Config back to ContainerConfig
Diffstat (limited to 'libpod/state_test.go')
-rw-r--r--libpod/state_test.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/libpod/state_test.go b/libpod/state_test.go
index ee4201b1c..4bd00ab55 100644
--- a/libpod/state_test.go
+++ b/libpod/state_test.go
@@ -156,7 +156,7 @@ func TestGetContainerPodSameIDFails(t *testing.T) {
func TestAddInvalidContainerFails(t *testing.T) {
runForAllStates(t, func(t *testing.T, state State, manager lock.Manager) {
- err := state.AddContainer(&Container{config: &Config{ID: "1234"}})
+ err := state.AddContainer(&Container{config: &ContainerConfig{ID: "1234"}})
assert.Error(t, err)
})
}
@@ -756,7 +756,7 @@ func TestUpdateContainerNotInDatabaseReturnsError(t *testing.T) {
func TestUpdateInvalidContainerReturnsError(t *testing.T) {
runForAllStates(t, func(t *testing.T, state State, manager lock.Manager) {
- err := state.UpdateContainer(&Container{config: &Config{ID: "1234"}})
+ err := state.UpdateContainer(&Container{config: &ContainerConfig{ID: "1234"}})
assert.Error(t, err)
})
}
@@ -780,7 +780,7 @@ func TestUpdateContainerNotInNamespaceReturnsError(t *testing.T) {
func TestSaveInvalidContainerReturnsError(t *testing.T) {
runForAllStates(t, func(t *testing.T, state State, manager lock.Manager) {
- err := state.SaveContainer(&Container{config: &Config{ID: "1234"}})
+ err := state.SaveContainer(&Container{config: &ContainerConfig{ID: "1234"}})
assert.Error(t, err)
})
}
@@ -2604,7 +2604,7 @@ func TestAddContainerToPodInvalidCtr(t *testing.T) {
err = state.AddPod(testPod)
assert.NoError(t, err)
- err = state.AddContainerToPod(testPod, &Container{config: &Config{ID: "1234"}})
+ err = state.AddContainerToPod(testPod, &Container{config: &ContainerConfig{ID: "1234"}})
assert.Error(t, err)
ctrs, err := state.PodContainersByID(testPod)