knative
/
client
mirror of https://github.com/knative/client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up e2e test assertion (#264) 

* Clean up e2e test assertion

Heavily rely on assert package as well as unit tests

* Iterate over a line for ensuring valid output

* Use subtests for easily spotting the error location
This commit is contained in:
Tsubasa Nagasawa 2019-07-15 20:41:26 +09:00 committed by Knative Prow Robot
parent be24f7b89d
commit fca0a09e86
4 changed files with 108 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
test/e2e/basic_workflow_test.go
View File

@ -20,6 +20,9 @@ import (
"fmt"
"strings"
"testing"
"github.com/knative/client/pkg/util"
"gotest.tools/assert"
)
var (
@ -46,140 +49,127 @@ func TestBasicWorkflow(t *testing.T) {
teardown := Setup(t)
defer teardown(t)
testServiceListEmpty(t, k)
testServiceCreate(t, k, "hello")
testServiceList(t, k, "hello")
testServiceDescribe(t, k, "hello")
testServiceUpdate(t, k, "hello", []string{"--env", "TARGET=kn", "--port", "8888"})
testServiceCreate(t, k, "svc2")
testRevisionListForService(t, k, "hello")
testRevisionListForService(t, k, "svc2")
testRouteList(t, k)
testRouteListWithArgument(t, k, "hello")
testServiceDelete(t, k, "hello")
testServiceDelete(t, k, "svc2")
testServiceListEmpty(t, k)
t.Run("returns no service before running tests", func(t *testing.T) {
testServiceListEmpty(t, k)
})
t.Run("create hello service and returns no error", func(t *testing.T) {
testServiceCreate(t, k, "hello")
})
t.Run("returns valid info about hello service", func(t *testing.T) {
testServiceList(t, k, "hello")
testServiceDescribe(t, k, "hello")
})
t.Run("update hello service's configuration and returns no error", func(t *testing.T) {
testServiceUpdate(t, k, "hello", []string{"--env", "TARGET=kn", "--port", "8888"})
})
t.Run("create another service and returns no error", func(t *testing.T) {
testServiceCreate(t, k, "svc2")
})
t.Run("returns a list of revisions associated with hello and svc2 services", func(t *testing.T) {
testRevisionListForService(t, k, "hello")
testRevisionListForService(t, k, "svc2")
})
t.Run("returns a list of routes associated with hello and svc2 services", func(t *testing.T) {
testRouteList(t, k)
testRouteListWithArgument(t, k, "hello")
})
t.Run("delete hello and svc2 services and returns no error", func(t *testing.T) {
testServiceDelete(t, k, "hello")
testServiceDelete(t, k, "svc2")
})
t.Run("returns no service after completing tests", func(t *testing.T) {
testServiceListEmpty(t, k)
})
}
// Private test functions
func testServiceListEmpty(t *testing.T, k kn) {
out, err := k.RunWithOpts([]string{"service", "list"}, runOpts{NoNamespace: false})
if err != nil {
t.Fatalf(fmt.Sprintf("Error executing 'kn service list' command. Error: %s", err.Error()))
}
assert.NilError(t, err)
if !strings.Contains(out, "No resources found.") {
t.Fatalf("Expected output 'No resources found.' Instead found:\n%s\n", out)
}
assert.Check(t, util.ContainsAll(out, "No resources found."))
}
func testServiceCreate(t *testing.T, k kn, serviceName string) {
out, err := k.RunWithOpts([]string{"service", "create",
fmt.Sprintf("%s", serviceName),
"--image", KnDefaultTestImage}, runOpts{NoNamespace: false})
if err != nil {
t.Fatalf(fmt.Sprintf("Error executing 'kn service create' command. Error: %s", err.Error()))
}
assert.NilError(t, err)
if !strings.Contains(out, fmt.Sprintf("Service '%s' successfully created in namespace '%s'.", serviceName, k.namespace)) {
t.Fatalf(fmt.Sprintf("Expected to find: Service '%s' successfully created in namespace '%s'. Instead found:\n%s\n", serviceName, k.namespace, out))
}
assert.Check(t, util.ContainsAll(out, "Service", serviceName, "successfully created in namespace", k.namespace, "OK"))
}
func testServiceList(t *testing.T, k kn, serviceName string) {
out, err := k.RunWithOpts([]string{"service", "list", serviceName}, runOpts{NoNamespace: false})
if err != nil {
t.Fatalf(fmt.Sprintf("Error executing 'kn service list %s' command. Error: %s", serviceName, err.Error()))
}
assert.NilError(t, err)
expectedOutput := fmt.Sprintf("%s", serviceName)
if !strings.Contains(out, expectedOutput) {
t.Fatalf("Expected output incorrect, expecting to include:\n%s\n Instead found:\n%s\n", expectedOutput, out)
}
assert.Check(t, util.ContainsAll(out, expectedOutput))
}
func testRevisionListForService(t *testing.T, k kn, serviceName string) {
out, err := k.RunWithOpts([]string{"revision", "list", "-s", serviceName}, runOpts{NoNamespace: false})
if err != nil {
t.Fatalf(fmt.Sprintf("Error executing 'kn revision list -s %s' command. Error: %s", serviceName, err.Error()))
}
assert.NilError(t, err)
outputLines := strings.Split(out, "\n")
for _, line := range outputLines[1:] {
if len(line) > 1 && !strings.HasPrefix(line, serviceName) {
t.Fatalf(fmt.Sprintf("Expected output incorrect, expecting line to start with service name: %s\nFound: %s", serviceName, line))
}
// Ignore the last line because it is an empty string caused by splitting a line break
// at the end of the output string
for _, line := range outputLines[1 : len(outputLines)-1] {
// The last item is the revision status, which should be ready
assert.Check(t, util.ContainsAll(line, " "+serviceName+" ", "True"))
}
}
func testServiceDescribe(t *testing.T, k kn, serviceName string) {
out, err := k.RunWithOpts([]string{"service", "describe", serviceName}, runOpts{NoNamespace: false})
if err != nil {
t.Fatalf(fmt.Sprintf("Error executing 'kn service describe' command. Error: %s", err.Error()))
}
assert.NilError(t, err)
expectedOutputHeader := `apiVersion: serving.knative.dev/v1alpha1
kind: Service
metadata:`
if !strings.Contains(out, expectedOutputHeader) {
t.Fatalf(fmt.Sprintf("Expected output incorrect, expecting to include:\n%s\n Instead found:\n%s\n", expectedOutputHeader, out))
}
expectedOutput := `generation: 1
name: %s
namespace: %s`
expectedOutput = fmt.Sprintf(expectedOutput, serviceName, k.namespace)
if !strings.Contains(out, expectedOutput) {
t.Fatalf(fmt.Sprintf("Expected output incorrect, expecting to include:\n%s\n Instead found:\n%s\n", expectedOutput, out))
}
assert.Check(t, util.ContainsAll(out, expectedOutputHeader, expectedOutput))
}
func testServiceUpdate(t *testing.T, k kn, serviceName string, args []string) {
out, err := k.RunWithOpts(append([]string{"service", "update", serviceName}, args...), runOpts{NoNamespace: false})
if err != nil {
t.Fatalf(fmt.Sprintf("Error executing 'kn service update' command. Error: %s", err.Error()))
}
assert.NilError(t, err)
expectedOutput := fmt.Sprintf("Service '%s' updated", serviceName)
if !strings.Contains(out, expectedOutput) {
t.Fatalf(fmt.Sprintf("Expected output incorrect, expecting to include:\n%s\nFound:\n%s\n", expectedOutput, out))
}
assert.Check(t, util.ContainsAll(out, expectedOutput))
}
func testRouteList(t *testing.T, k kn) {
out, err := k.RunWithOpts([]string{"route", "list"}, runOpts{})
if err != nil {
t.Errorf(fmt.Sprintf("Error executing 'kn route list' command. Error: %s", err.Error()))
}
assert.NilError(t, err)
expectedHeaders := []string{"NAME", "URL", "AGE", "CONDITIONS", "TRAFFIC"}
for _, header := range expectedHeaders {
if !strings.Contains(out, header) {
t.Errorf("Expected to include header %s in 'kn route list' output. Actual output:\n%s\n", header, out)
}
}
assert.Check(t, util.ContainsAll(out, expectedHeaders...))
}
func testRouteListWithArgument(t *testing.T, k kn, routeName string) {
out, err := k.RunWithOpts([]string{"route", "list", routeName}, runOpts{})
if err != nil {
t.Errorf("Error executing 'kn route list %s' command. Error: %s", routeName, err.Error())
}
expectedOutput := routeName
if !strings.Contains(out, expectedOutput) {
t.Errorf("Expected output incorrect, expecting to include:\n%s\n Instead found:\n%s\n", expectedOutput, out)
}
expectedOutput = fmt.Sprintf("100%% -> %s", routeName)
if !strings.Contains(out, expectedOutput) {
t.Errorf("Expected output incorrect, expecting to include:\n%s\n Instead found:\n%s\n", expectedOutput, out)
}
assert.NilError(t, err)
expectedOutput := fmt.Sprintf("100%% -> %s", routeName)
assert.Check(t, util.ContainsAll(out, routeName, expectedOutput))
}
func testServiceDelete(t *testing.T, k kn, serviceName string) {
out, err := k.RunWithOpts([]string{"service", "delete", serviceName}, runOpts{NoNamespace: false})
if err != nil {
t.Fatalf(fmt.Sprintf("Error executing 'kn service delete' command. Error: %s", err.Error()))
}
assert.NilError(t, err)
if !strings.Contains(out, fmt.Sprintf("Service '%s' successfully deleted in namespace '%s'.", serviceName, k.namespace)) {
t.Fatalf(fmt.Sprintf("Expected to find: Service '%s' successfully deleted in namespace '%s'. Instead found:\n%s\n", serviceName, k.namespace, out))
}
assert.Check(t, util.ContainsAll(out, "Service", serviceName, "successfully deleted in namespace", k.namespace))
}

24
test/e2e/revision_workflow_test.go
View File

@ -28,22 +28,28 @@ func TestRevisionWorkflow(t *testing.T) {
teardown := Setup(t)
defer teardown(t)
testServiceCreate(t, k, "hello")
testDeleteRevision(t, k, "hello")
testServiceDelete(t, k, "hello")
t.Run("create hello service and returns no error", func(t *testing.T) {
testServiceCreate(t, k, "hello")
})
t.Run("delete latest revision from hello service and returns no error", func(t *testing.T) {
testDeleteRevision(t, k, "hello")
})
t.Run("delete hello service and returns no error", func(t *testing.T) {
testServiceDelete(t, k, "hello")
})
}
func testDeleteRevision(t *testing.T, k kn, serviceName string) {
revName, err := k.RunWithOpts([]string{"revision", "list", "-o=jsonpath={.items[0].metadata.name}"}, runOpts{})
if err != nil {
t.Errorf("Error executing 'revision list -o' command. Error: %s", err.Error())
}
assert.NilError(t, err)
if strings.Contains(revName, "No resources found.") {
t.Errorf("Could not find revision name.")
}
out, err := k.RunWithOpts([]string{"revision", "delete", revName}, runOpts{})
if err != nil {
t.Errorf("Error executing 'revision delete %s' command. Error: %s", revName, err.Error())
}
assert.NilError(t, err)
assert.Check(t, util.ContainsAll(out, "Revision", revName, "deleted", "namespace", k.namespace))
}

26
test/e2e/service_options_test.go
View File

@ -28,12 +28,26 @@ func TestServiceOptions(t *testing.T) {
teardown := Setup(t)
defer teardown(t)
testServiceCreateWithOptions(t, k, "hello", []string{"--concurrency-limit", "250", "--concurrency-target", "300"})
testServiceDescribeConcurrencyLimit(t, k, "hello", "250")
testServiceDescribeConcurrencyTarget(t, k, "hello", "300")
testServiceUpdate(t, k, "hello", []string{"--concurrency-limit", "300"})
testServiceDescribeConcurrencyLimit(t, k, "hello", "300")
testServiceDelete(t, k, "hello")
t.Run("create hello service with concurrency options and returns no error", func(t *testing.T) {
testServiceCreateWithOptions(t, k, "hello", []string{"--concurrency-limit", "250", "--concurrency-target", "300"})
})
t.Run("returns valid concurrency options for hello service", func(t *testing.T) {
testServiceDescribeConcurrencyLimit(t, k, "hello", "250")
testServiceDescribeConcurrencyTarget(t, k, "hello", "300")
})
t.Run("update concurrency limit for hello service and returns no error", func(t *testing.T) {
testServiceUpdate(t, k, "hello", []string{"--concurrency-limit", "300"})
})
t.Run("returns correct concurrency limit for hello service", func(t *testing.T) {
testServiceDescribeConcurrencyLimit(t, k, "hello", "300")
})
t.Run("delete hello service and returns no error", func(t *testing.T) {
testServiceDelete(t, k, "hello")
})
}
func testServiceCreateWithOptions(t *testing.T, k kn, serviceName string, options []string) {

8
test/e2e/version_test.go
View File

@ -17,8 +17,10 @@
package e2e
import (
"strings"
"testing"
"github.com/knative/client/pkg/util"
"gotest.tools/assert"
)
func TestVersion(t *testing.T) {
@ -27,7 +29,5 @@ func TestVersion(t *testing.T) {
out, _ := kn.RunWithOpts([]string{"version"}, runOpts{NoNamespace: true})
if !strings.Contains(out, "Version") {
t.Fatalf("Expected to find client version")
}
assert.Check(t, util.ContainsAll(out, "Version"))
}