ソースを参照

Move TestBuildOnBuildForbiddenMaintainerTrigger to integration-cli

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Alexandr Morozov 11 年 前
コミット
690711b584
2 ファイル変更17 行追加14 行削除
  1. 17 0
      integration-cli/docker_cli_build_test.go
  2. 0 14
      integration/buildfile_test.go

+ 17 - 0
integration-cli/docker_cli_build_test.go

@@ -1341,3 +1341,20 @@ func TestBuildOnBuildForbiddenFrom(t *testing.T) {
 	}
 	logDone("build - onbuild forbidden from")
 }
+
+func TestBuildOnBuildForbiddenMaintainer(t *testing.T) {
+	name := "testbuildonbuildforbiddenmaintainer"
+	defer deleteImages(name)
+	_, err := buildImage(name,
+		`FROM busybox
+		ONBUILD MAINTAINER docker.io`,
+		true)
+	if err != nil {
+		if !strings.Contains(err.Error(), "MAINTAINER isn't allowed as an ONBUILD trigger") {
+			t.Fatalf("Wrong error %v, must be about MAINTAINER forbidden", err)
+		}
+	} else {
+		t.Fatal("Error must not be nil")
+	}
+	logDone("build - onbuild forbidden maintainer")
+}

+ 0 - 14
integration/buildfile_test.go

@@ -413,20 +413,6 @@ func buildImage(context testContextTemplate, t *testing.T, eng *engine.Engine, u
 	return image, err
 }
 
-func TestBuildOnBuildForbiddenMaintainerTrigger(t *testing.T) {
-	_, err := buildImage(testContextTemplate{`
-	from {IMAGE}
-	onbuild maintainer test
-	`,
-		nil, nil,
-	},
-		t, nil, true,
-	)
-	if err == nil {
-		t.Fatal("Error should not be nil")
-	}
-}
-
 // gh #2446
 func TestBuildAddToSymlinkDest(t *testing.T) {
 	eng := NewTestEngine(t)