Browse code

Rewrite TestBuildSixtySteps to not use fixtures

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>

Alexandr Morozov authored on 2014/09/22 23:18:19
Showing 3 changed files
1 1
deleted file mode 100644
... ...
@@ -1,60 +0,0 @@
1
-FROM scratch
2
-ADD foo /
3
-ADD foo /
4
-ADD foo /
5
-ADD foo /
6
-ADD foo /
7
-ADD foo /
8
-ADD foo /
9
-ADD foo /
10
-ADD foo /
11
-ADD foo /
12
-ADD foo /
13
-ADD foo /
14
-ADD foo /
15
-ADD foo /
16
-ADD foo /
17
-ADD foo /
18
-ADD foo /
19
-ADD foo /
20
-ADD foo /
21
-ADD foo /
22
-ADD foo /
23
-ADD foo /
24
-ADD foo /
25
-ADD foo /
26
-ADD foo /
27
-ADD foo /
28
-ADD foo /
29
-ADD foo /
30
-ADD foo /
31
-ADD foo /
32
-ADD foo /
33
-ADD foo /
34
-ADD foo /
35
-ADD foo /
36
-ADD foo /
37
-ADD foo /
38
-ADD foo /
39
-ADD foo /
40
-ADD foo /
41
-ADD foo /
42
-ADD foo /
43
-ADD foo /
44
-ADD foo /
45
-ADD foo /
46
-ADD foo /
47
-ADD foo /
48
-ADD foo /
49
-ADD foo /
50
-ADD foo /
51
-ADD foo /
52
-ADD foo /
53
-ADD foo /
54
-ADD foo /
55
-ADD foo /
56
-ADD foo /
57
-ADD foo /
58
-ADD foo /
59
-ADD foo /
60
-ADD foo /
61 1
deleted file mode 100644
... ...
@@ -1 +0,0 @@
1
-a
... ...
@@ -46,16 +46,18 @@ func TestBuildCacheADD(t *testing.T) {
46 46
 }
47 47
 
48 48
 func TestBuildSixtySteps(t *testing.T) {
49
-	buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestBuildSixtySteps")
50
-	out, exitCode, err := dockerCmdInDir(t, buildDirectory, "build", "-t", "foobuildsixtysteps", ".")
51
-	errorOut(err, t, fmt.Sprintf("build failed to complete: %v %v", out, err))
52
-
53
-	if err != nil || exitCode != 0 {
54
-		t.Fatal("failed to build the image")
49
+	name := "foobuildsixtysteps"
50
+	defer deleteImages(name)
51
+	ctx, err := fakeContext("FROM scratch\n"+strings.Repeat("ADD foo /\n", 60),
52
+		map[string]string{
53
+			"foo": "test1",
54
+		})
55
+	if err != nil {
56
+		t.Fatal(err)
57
+	}
58
+	if _, err := buildImageFromContext(name, ctx, true); err != nil {
59
+		t.Fatal(err)
55 60
 	}
56
-
57
-	deleteImages("foobuildsixtysteps")
58
-
59 61
 	logDone("build - build an image with sixty build steps")
60 62
 }
61 63