summaryrefslogtreecommitdiff
path: root/runconfig/config_test.go
diff options
context:
space:
mode:
authorDavid Calavera <david.calavera@gmail.com>2015-12-18 13:36:17 -0500
committerDavid Calavera <david.calavera@gmail.com>2015-12-22 13:34:30 -0500
commit7ac4232e70fe7cf7318333cd0890db7f95663079 (patch)
tree7bf9828f5024e5b5aa7e27d444757ac3a81aba3b /runconfig/config_test.go
parent747dccde41762f10d0afcdd9b243fb1ea85cbd9f (diff)
downloaddocker-7ac4232e70fe7cf7318333cd0890db7f95663079.tar.gz
Move Config and HostConfig from runconfig to types/container.
- Make the API client library completely standalone. - Move windows partition isolation detection to the client, so the driver doesn't use external types. Signed-off-by: David Calavera <david.calavera@gmail.com>
Diffstat (limited to 'runconfig/config_test.go')
-rw-r--r--runconfig/config_test.go9
1 files changed, 5 insertions, 4 deletions
diff --git a/runconfig/config_test.go b/runconfig/config_test.go
index e09b13ac26..7a1c785c2f 100644
--- a/runconfig/config_test.go
+++ b/runconfig/config_test.go
@@ -9,6 +9,7 @@ import (
"strings"
"testing"
+ "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/strslice"
)
@@ -101,16 +102,16 @@ func TestDecodeContainerConfigIsolation(t *testing.T) {
// callDecodeContainerConfigIsolation is a utility function to call
// DecodeContainerConfig for validating isolation levels
-func callDecodeContainerConfigIsolation(isolation string) (*Config, *HostConfig, error) {
+func callDecodeContainerConfigIsolation(isolation string) (*container.Config, *container.HostConfig, error) {
var (
b []byte
err error
)
w := ContainerConfigWrapper{
- Config: &Config{},
- HostConfig: &HostConfig{
+ Config: &container.Config{},
+ HostConfig: &container.HostConfig{
NetworkMode: "none",
- Isolation: IsolationLevel(isolation)},
+ Isolation: container.IsolationLevel(isolation)},
}
if b, err = json.Marshal(w); err != nil {
return nil, nil, fmt.Errorf("Error on marshal %s", err.Error())