moved the scale activation test to service_options_test.go

test/e2e/service_options_test.go

@@ -44,7 +44,7 @@ func TestServiceOptions(t *testing.T) {
 		assert.NilError(t, it.Teardown())
 	}()
 
-	kubectl := test.NewKubectl(it.Namespace())
+	//kubectl := test.NewKubectl(it.Namespace())
 	r := test.NewKnRunResultCollector(t, it)
 
 	defer r.DumpIfFailed()
@@ -231,6 +231,10 @@ func TestServiceOptions(t *testing.T) {
 	test.ServiceDelete(r, "svc17")
 	_, err = kubectl.Run("delete", "-n", it.Namespace(), "configmap", "test-cm2")
 	assert.NilError(t, err)
+
+	t.Log("create and validate a service with scale activation")
+	serviceCreateWithOptions(r, "svc18", "--scale-activation", "2")
+	validateServiceActivation(r, "svc18", 2)
 }
 
 func serviceCreateWithOptions(r *test.KnRunResultCollector, serviceName string, options ...string) {
@@ -384,3 +388,12 @@ func validateServiceEnvVariables(r *test.KnRunResultCollector, serviceName strin
 		}
 	}
 }
+
+func validateServiceActivation(r *test.KnRunResultCollector, serviceName string, activation int) {
+	out := r.KnTest().Kn().Run("service", "describe", serviceName, "-o", "json")
+	r.AssertNoError(out)
+	var svc servingv1.Service
+	json.Unmarshal([]byte(out.Stdout), &svc)
+	activationStr := strconv.Itoa(activation)
+	assert.Check(r.T(), svc.Spec.Template.Annotations[autoscaling.ActivationScaleKey] == activationStr)
+}

test/e2e/service_test.go

@@ -22,7 +22,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"strconv"
 	"strings"
 	"testing"
 
@@ -32,7 +31,6 @@ import (
 	"knative.dev/client/pkg/util"
 	network "knative.dev/networking/pkg/apis/networking"
 	pkgtest "knative.dev/pkg/test"
-	"knative.dev/serving/pkg/apis/autoscaling"
 	"knative.dev/serving/pkg/apis/serving"
 	servingv1 "knative.dev/serving/pkg/apis/serving/v1"
 )
@@ -93,9 +91,6 @@ func TestService(t *testing.T) {
 
 	t.Log("create services with volume mounts and subpaths")
 	serviceCreateWithMount(r)
-
-	t.Log("create service with scale activation")
-	serviceCreateActivation(r, "svc1", 2)
 }
 
 func serviceCreatePrivate(r *test.KnRunResultCollector, serviceName string) {
@@ -279,16 +274,3 @@ func serviceDescribeMount(r *test.KnRunResultCollector, serviceName, hostPath, s
 	r.T().Log("check volume mount subpath is the same as given")
 	assert.Equal(r.T(), subPath, volumeMount.SubPath)
 }
-
-func serviceCreateActivation(r *test.KnRunResultCollector, serviceName string, activation int) {
-	out := r.KnTest().Kn().Run("service", "create", serviceName,
-		"--image", pkgtest.ImagePath("helloworld"), "--scale-activation", strconv.Itoa(activation))
-	r.AssertNoError(out)
-	assert.Check(r.T(), util.ContainsAllIgnoreCase(out.Stdout, "service", serviceName, "creating", "namespace", r.KnTest().Kn().Namespace(), "ready"))
-
-	out = r.KnTest().Kn().Run("service", "describe", serviceName, "-o", "json")
-	r.AssertNoError(out)
-	var svc servingv1.Service
-	json.Unmarshal([]byte(out.Stdout), &svc)
-	assert.Check(r.T(), svc.Spec.Template.Annotations[autoscaling.ActivationScaleKey] == "2")
-}