Add more integration tests for multiple composefile

Signed-off-by: Vincent Demeester <[email protected]>

Author: vdemeester

docker/convert_test.go

@@ -19,7 +19,7 @@ func TestParseCommand(t *testing.T) {
 
 func TestParseBindsAndVolumes(t *testing.T) {
 	ctx := &Context{}
-	ctx.ComposeFile = "foo/docker-compose.yml"
+	ctx.ComposeFiles = []string{"foo/docker-compose.yml"}
 	ctx.ResourceLookup = &lookup.FileConfigLookup{}
 
 	abs, err := filepath.Abs(".")
@@ -34,7 +34,7 @@ func TestParseBindsAndVolumes(t *testing.T) {
 
 func TestParseLabels(t *testing.T) {
 	ctx := &Context{}
-	ctx.ComposeFile = "foo/docker-compose.yml"
+	ctx.ComposeFiles = []string{"foo/docker-compose.yml"}
 	ctx.ResourceLookup = &lookup.FileConfigLookup{}
 	bashCmd := "bash"
 	fooLabel := "foo.label"

integration/assets/multiple-composefiles-default/docker-compose.override.yml

@@ -0,0 +1,3 @@
+yetanother:
+  image: busybox:latest
+  command: top

integration/assets/multiple-composefiles-default/docker-compose.yml

@@ -0,0 +1,6 @@
+simple:
+  image: busybox:latest
+  command: top
+another:
+  image: busybox:latest
+  command: top

integration/create_test.go

@@ -6,6 +6,7 @@ import (
 	"os/exec"
 
 	. "gopkg.in/check.v1"
+	"path/filepath"
 )
 
 func (s *RunSuite) TestFields(c *C) {
@@ -172,9 +173,9 @@ func (s *RunSuite) TestFieldTypeConversions(c *C) {
 	os.Unsetenv("LIMIT")
 }
 
-func (s *RunSuite) TestMultipleComposeFiles(c *C) {
-	p := s.RandomProject()
-	cmd := exec.Command(s.command, "-f", "./assets/multiple/one.yml", "-f", "./assets/multiple/two.yml", "-p", p, "create")
+func (s *RunSuite) TestMultipleComposeFilesOneTwo(c *C) {
+	p := "multiple"
+	cmd := exec.Command(s.command, "-f", "./assets/multiple/one.yml", "-f", "./assets/multiple/two.yml", "create")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	cmd.Stdin = os.Stdin
@@ -197,27 +198,53 @@ func (s *RunSuite) TestMultipleComposeFiles(c *C) {
 	c.Assert(container.Config.Image, Equals, "busybox")
 	c.Assert(container.Config.Cmd, DeepEquals, []string{"echo", "two"})
 	c.Assert(container.Config.Env, DeepEquals, []string{"KEY1=VAL1", "KEY2=VAL2"})
+}
 
-	p = s.RandomProject()
-	cmd = exec.Command(s.command, "-f", "./assets/multiple/two.yml", "-f", "./assets/multiple/one.yml", "-p", p, "create")
+func (s *RunSuite) TestMultipleComposeFilesTwoOne(c *C) {
+	p := "multiple"
+	cmd := exec.Command(s.command, "-f", "./assets/multiple/two.yml", "-f", "./assets/multiple/one.yml", "create")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	cmd.Stdin = os.Stdin
-	err = cmd.Run()
+	err := cmd.Run()
 
 	c.Assert(err, IsNil)
 
+	containerNames := []string{"multiple", "simple", "another", "yetanother"}
+
 	for _, containerName := range containerNames {
 		name := fmt.Sprintf("%s_%s_1", p, containerName)
 		container := s.GetContainerByName(c, name)
 
 		c.Assert(container, NotNil)
 	}
 
-	name = fmt.Sprintf("%s_%s_1", p, "multiple")
-	container = s.GetContainerByName(c, name)
+	name := fmt.Sprintf("%s_%s_1", p, "multiple")
+	container := s.GetContainerByName(c, name)
 
 	c.Assert(container.Config.Image, Equals, "tianon/true")
 	c.Assert(container.Config.Cmd, DeepEquals, []string{"echo", "two"})
 	c.Assert(container.Config.Env, DeepEquals, []string{"KEY2=VAL2", "KEY1=VAL1"})
 }
+
+func (s *RunSuite) TestDefaultMultipleComposeFiles(c *C) {
+	p := s.RandomProject()
+	cmd := exec.Command(filepath.Join("../../", s.command), "-p", p, "create")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	cmd.Stdin = os.Stdin
+	cmd.Dir = "./assets/multiple-composefiles-default/"
+	err := cmd.Run()
+
+	c.Assert(err, IsNil)
+
+	containerNames := []string{"simple", "another", "yetanother"}
+
+	for _, containerName := range containerNames {
+		name := fmt.Sprintf("%s_%s_1", p, containerName)
+		container := s.GetContainerByName(c, name)
+
+		c.Assert(container, NotNil)
+	}
+
+}

project/context.go

@@ -57,11 +57,11 @@ func (c *Context) readComposeFiles() error {
 
 	for _, composeFile := range c.ComposeFiles {
 		composeBytes, err := ioutil.ReadFile(composeFile)
-		if !os.IsNotExist(err) {
+		if err != nil && !os.IsNotExist(err) {
 			logrus.Errorf("Failed to open the compose file: %s", composeFile)
 			return err
 		}
-		if !c.IgnoreMissingConfig {
+		if err != nil && !c.IgnoreMissingConfig {
 			logrus.Errorf("Failed to find the compose file: %s", composeFile)
 			return err
 		}