1. docker
  2. Commit 386d1ecc6e2489401aac685eb11da15d21c4b0a7
Browse code

Move sorter_test from integration to integration-cli

TestServerListOrderedImagesByCreationDateAndTag was redundant and broken
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)

LK4D4 authored on 2014/06/24 03:19:52
Showing 2 changed files
integration-cli/docker_cli_images_test.go
History View file @ 386d1ec
... ... 
@@ -5,6 +5,7 @@ import (
5 5 
 	"os/exec"
6 6 
 	"strings"
7 7 
 	"testing"
8 
+	"time"
8 9 
 )
9 10
10 11 
 func TestImagesEnsureImageIsListed(t *testing.T) {
... ... 
@@ -56,3 +57,44 @@ func TestCLIImageTagRemove(t *testing.T) {
56 56 
 	}
57 57 
 	logDone("tag,rmi- tagging the same images multiple times then removing tags")
58 58 
 }
59 
+
60 
+func TestImagesOrderedByCreationDate(t *testing.T) {
61 
+	defer deleteImages("order:test_a")
62 
+	defer deleteImages("order:test_c")
63 
+	defer deleteImages("order:test_b")
64 
+	id1, err := buildImage("order:test_a",
65 
+		`FROM scratch
66 
+		MAINTAINER dockerio1`, true)
67 
+	if err != nil {
68 
+		t.Fatal(err)
69 
+	}
70 
+	time.Sleep(time.Second)
71 
+	id2, err := buildImage("order:test_c",
72 
+		`FROM scratch
73 
+		MAINTAINER dockerio2`, true)
74 
+	if err != nil {
75 
+		t.Fatal(err)
76 
+	}
77 
+	time.Sleep(time.Second)
78 
+	id3, err := buildImage("order:test_b",
79 
+		`FROM scratch
80 
+		MAINTAINER dockerio3`, true)
81 
+	if err != nil {
82 
+		t.Fatal(err)
83 
+	}
84 
+
85 
+	out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "images", "-q", "--no-trunc"))
86 
+	errorOut(err, t, fmt.Sprintf("listing images failed with errors: %v", err))
87 
+	imgs := strings.Split(out, "\n")
88 
+	if imgs[0] != id3 {
89 
+		t.Fatalf("First image must be %s, got %s", id3, imgs[0])
90 
+	}
91 
+	if imgs[1] != id2 {
92 
+		t.Fatalf("Second image must be %s, got %s", id2, imgs[1])
93 
+	}
94 
+	if imgs[2] != id1 {
95 
+		t.Fatalf("Third image must be %s, got %s", id1, imgs[2])
96 
+	}
97 
+
98 
+	logDone("images - ordering by creation date")
99 
+}
integration/sorter_test.go
History View file @ 386d1ec
59 100 
deleted file mode 100644
... ... 
@@ -1,56 +0,0 @@
1 
-package docker
2 
-
3 
-import (
4 
-	"github.com/dotcloud/docker/engine"
5 
-	"testing"
6 
-	"time"
7 
-)
8 
-
9 
-func TestServerListOrderedImagesByCreationDate(t *testing.T) {
10 
-	eng := NewTestEngine(t)
11 
-	defer mkDaemonFromEngine(eng, t).Nuke()
12 
-
13 
-	if err := generateImage("", eng); err != nil {
14 
-		t.Fatal(err)
15 
-	}
16 
-
17 
-	images := getImages(eng, t, true, "")
18 
-
19 
-	if images.Data[0].GetInt("Created") < images.Data[1].GetInt("Created") {
20 
-		t.Error("Expected images to be ordered by most recent creation date.")
21 
-	}
22 
-}
23 
-
24 
-func TestServerListOrderedImagesByCreationDateAndTag(t *testing.T) {
25 
-	eng := NewTestEngine(t)
26 
-	defer mkDaemonFromEngine(eng, t).Nuke()
27 
-
28 
-	err := generateImage("bar", eng)
29 
-	if err != nil {
30 
-		t.Fatal(err)
31 
-	}
32 
-
33 
-	time.Sleep(time.Second)
34 
-
35 
-	err = generateImage("zed", eng)
36 
-	if err != nil {
37 
-		t.Fatal(err)
38 
-	}
39 
-
40 
-	images := getImages(eng, t, true, "")
41 
-
42 
-	if repoTags := images.Data[0].GetList("RepoTags"); repoTags[0] != "repo:zed" && repoTags[0] != "repo:bar" {
43 
-		t.Errorf("Expected Images to be ordered by most recent creation date.")
44 
-	}
45 
-}
46 
-
47 
-func generateImage(name string, eng *engine.Engine) error {
48 
-	archive, err := fakeTar()
49 
-	if err != nil {
50 
-		return err
51 
-	}
52 
-	job := eng.Job("import", "-", "repo", name)
53 
-	job.Stdin.Add(archive)
54 
-	job.SetenvBool("json", true)
55 
-	return job.Run()
56 
-}