diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-08 07:06:09 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-08 07:06:09 -0800 |
commit | 9474b8cea239348d11c913b03b9461afaf663f0b (patch) | |
tree | 6bc89d8f2881c0eeb4df5d24b938c69008d8dce9 /libpod/common_test.go | |
parent | 4f19f1afcaa67f8e775e303b1b6627fb5abd9116 (diff) | |
parent | 5ed23327a9e68219f6d1eaf38e0533e732438eb5 (diff) | |
download | podman-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/common_test.go')
-rw-r--r-- | libpod/common_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/common_test.go b/libpod/common_test.go index 882468a3a..efbb5f404 100644 --- a/libpod/common_test.go +++ b/libpod/common_test.go @@ -17,7 +17,7 @@ import ( func getTestContainer(id, name string, manager lock.Manager) (*Container, error) { ctr := &Container{ - config: &Config{ + config: &ContainerConfig{ ID: id, Name: name, RootfsImageID: id, @@ -165,8 +165,8 @@ func testContainersEqual(t *testing.T, a, b *Container, allowedEmpty bool) { require.NotNil(t, a.state) require.NotNil(t, b.state) - aConfig := new(Config) - bConfig := new(Config) + aConfig := new(ContainerConfig) + bConfig := new(ContainerConfig) aState := new(containerState) bState := new(containerState) |