kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Using checkers assert for integration-cli/docker_cli_export_import_test.go 

Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
This commit is contained in:
Mohammed Aaqib Ansari 2015-10-20 17:53:27 -04:00
parent c516aa645e
commit e72f92cb99
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
integration-cli/docker_cli_export_import_test.go
View File

@ -5,6 +5,7 @@ import (
"os/exec"
"strings"
"github.com/docker/docker/pkg/integration/checker"
"github.com/go-check/check"
)
@ -20,14 +21,10 @@ func (s *DockerSuite) TestExportContainerAndImportImage(c *check.C) {
importCmd := exec.Command(dockerBinary, "import", "-", "repo/testexp:v1")
importCmd.Stdin = strings.NewReader(out)
out, _, err := runCommandWithOutput(importCmd)
if err != nil {
c.Fatalf("failed to import image: %s, %v", out, err)
}
c.Assert(err, checker.IsNil, check.Commentf("failed to import image repo/testexp:v1: %s", out))
cleanedImageID := strings.TrimSpace(out)
if cleanedImageID == "" {
c.Fatalf("output should have been an image id, got: %s", out)
}
c.Assert(cleanedImageID, checker.Not(checker.Equals), "", check.Commentf("output should have been an image id"))
}
// Used to test output flag in the export command
@ -40,19 +37,13 @@ func (s *DockerSuite) TestExportContainerWithOutputAndImportImage(c *check.C) {
defer os.Remove("testexp.tar")
out, _, err := runCommandWithOutput(exec.Command("cat", "testexp.tar"))
if err != nil {
c.Fatal(out, err)
}
c.Assert(err, checker.IsNil, check.Commentf(out))
importCmd := exec.Command(dockerBinary, "import", "-", "repo/testexp:v1")
importCmd.Stdin = strings.NewReader(out)
out, _, err = runCommandWithOutput(importCmd)
if err != nil {
c.Fatalf("failed to import image: %s, %v", out, err)
}
c.Assert(err, checker.IsNil, check.Commentf("failed to import image repo/testexp:v1: %s", out))
cleanedImageID := strings.TrimSpace(out)
if cleanedImageID == "" {
c.Fatalf("output should have been an image id, got: %s", out)
}
c.Assert(cleanedImageID, checker.Not(checker.Equals), "", check.Commentf("output should have been an image id"))
}