Skip to content

Commit

Permalink
fix step names
Browse files Browse the repository at this point in the history
  • Loading branch information
dbadura committed Aug 13, 2020
1 parent 9e3dfc5 commit 0e52cb8
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion tests/function-controller/go.mod
Expand Up @@ -41,4 +41,4 @@ require (
replace knative.dev/pkg => knative.dev/pkg v0.0.0-20200113182502-b8dc5fbc6d2f

//TODO: remove after merge:https://github.com/kyma-project/kyma/pull/9126
replace github.com/kyma-project/kyma/components/function-controller => github.com/dbadura/kyma/components/function-controller v0.0.0-20200813111151-93e3c0ea5ac9
replace github.com/kyma-project/kyma/components/function-controller => github.com/dbadura/kyma/components/function-controller v0.0.0-20200813134905-1169866da02d
4 changes: 2 additions & 2 deletions tests/function-controller/go.sum
Expand Up @@ -100,8 +100,8 @@ github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dbadura/kyma/components/function-controller v0.0.0-20200813111151-93e3c0ea5ac9 h1:6R+pElEvcl+VfaziZ6XzAqEhRlELB9Um3faUawtSN60=
github.com/dbadura/kyma/components/function-controller v0.0.0-20200813111151-93e3c0ea5ac9/go.mod h1:6Fxxddum/XzkLRCXNdv05HNFK39f9fBEGQmzJ9ctfnU=
github.com/dbadura/kyma/components/function-controller v0.0.0-20200813134905-1169866da02d h1:Fdk0HHjxuS0K9HIfdCZ3pxszSFjZLxR3zilIaHgx/Z8=
github.com/dbadura/kyma/components/function-controller v0.0.0-20200813134905-1169866da02d/go.mod h1:6Fxxddum/XzkLRCXNdv05HNFK39f9fBEGQmzJ9ctfnU=
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
Expand Down
36 changes: 18 additions & 18 deletions tests/function-controller/testsuite/scenarios/runtime.go
Expand Up @@ -87,29 +87,29 @@ func FunctionTestStep(restConfig *rest.Config, cfg testsuite.Config, t *testing.
teststep.NewNamespaceStep(toolbox.Log, coreCli, cfg.Namespace),
teststep.NewAddonConfiguration("Create addon configuration", addon, addonURL),
step.Parallel(
teststep.NewSerialSteps(t, "Python 37 test",
teststep.CreateFunction(t, python37Cfg.Fn, "Create Python Function", runtimes.BasicPythonFunction("Hello From python")),
teststep.NewHTTPCheck(t, "Python pre update simple check through service", python37Cfg.InClusterURL, poll, "Hello From python"),
teststep.UpdateFunction(t, python37Cfg.Fn, "Update Python Function", runtimes.BasicPythonFunction("Hello From updated python")),
teststep.NewHTTPCheck(t, "Python post update simple check through service", python37Cfg.InClusterURL, poll, "Hello From updated python"),
teststep.NewSerialSteps(t, "Python37 test",
teststep.CreateFunction(t, python37Cfg.Fn, "Create Python37 Function", runtimes.BasicPythonFunction("Hello From python")),
teststep.NewHTTPCheck(t, "Python37 pre update simple check through service", python37Cfg.InClusterURL, poll, "Hello From python"),
teststep.UpdateFunction(t, python37Cfg.Fn, "Update Python37 Function", runtimes.BasicPythonFunction("Hello From updated python")),
teststep.NewHTTPCheck(t, "Python37 post update simple check through service", python37Cfg.InClusterURL, poll, "Hello From updated python"),
),
teststep.NewSerialSteps(t, "NodeJS 10 test",
teststep.CreateFunction(t, nodejs10Cfg.Fn, "Create Python Function", runtimes.BasicNodeJSFunction("Hello From nodejs10", serverlessv1alpha1.Nodejs10)),
teststep.NewHTTPCheck(t, "Python pre update simple check through service", nodejs10Cfg.InClusterURL, poll, "Hello From nodejs10"),
teststep.UpdateFunction(t, nodejs10Cfg.Fn, "Update Python Function", runtimes.BasicNodeJSFunction("Hello From updated nodejs10", serverlessv1alpha1.Nodejs10)),
teststep.NewHTTPCheck(t, "Python post update simple check through service", nodejs10Cfg.InClusterURL, poll, "Hello From updated nodejs10"),
teststep.NewSerialSteps(t, "NodeJS10 test",
teststep.CreateFunction(t, nodejs10Cfg.Fn, "Create NodeJS10 Function", runtimes.BasicNodeJSFunction("Hello From nodejs10", serverlessv1alpha1.Nodejs10)),
teststep.NewHTTPCheck(t, "NodeJS10 pre update simple check through service", nodejs10Cfg.InClusterURL, poll, "Hello From nodejs10"),
teststep.UpdateFunction(t, nodejs10Cfg.Fn, "Update NodeJS10 Function", runtimes.BasicNodeJSFunction("Hello From updated nodejs10", serverlessv1alpha1.Nodejs10)),
teststep.NewHTTPCheck(t, "NodeJS10 post update simple check through service", nodejs10Cfg.InClusterURL, poll, "Hello From updated nodejs10"),
),
teststep.NewSerialSteps(t, "NodeJS test",
teststep.NewSerialSteps(t, "NodeJS12 test",
teststep.CreateEmptyFunction(nodejs12Cfg.Fn),
teststep.CreateFunction(t, nodejs12Cfg.Fn, "Create NodeJS Function", runtimes.BasicNodeJSFunction("Hello From nodejs", serverlessv1alpha1.Nodejs12)),
teststep.NewDefaultedFunctionCheck("Check NodeJS function has correct default values", nodejs12Cfg.Fn),
teststep.ConfigureFunction(t, "Check NodeJS function post-upgrade", nodejs12Cfg.FnName, nodejs12Cfg.ApiRule, nodejs12Cfg.APIRuleURL,
teststep.CreateFunction(t, nodejs12Cfg.Fn, "Create NodeJS12 Function", runtimes.BasicNodeJSFunction("Hello From nodejs", serverlessv1alpha1.Nodejs12)),
teststep.NewDefaultedFunctionCheck("Check NodeJS12 function has correct default values", nodejs12Cfg.Fn),
teststep.ConfigureFunction(t, "Check NodeJS12 function post-upgrade", nodejs12Cfg.FnName, nodejs12Cfg.ApiRule, nodejs12Cfg.APIRuleURL,
nodejs12Cfg.SvcInstance, nodejs12Cfg.SvcInstanceName, nodejs12Cfg.SvcBinding, nodejs12Cfg.SvcBindingName, nodejs12Cfg.SvcBindingUsage, nodejs12Cfg.UsageName,
nodejs12Cfg.Br, nodejs12Cfg.Tr, cfg.DomainPort),
teststep.NewHTTPCheck(t, "NodeJS pre update simple check through service", nodejs12Cfg.APIRuleURL, poll, "Hello From nodejs"),
teststep.NewHTTPCheck(t, "NodeJS pre update simple check through gateway", nodejs12Cfg.InClusterURL, poll, "Hello From nodejs"),
teststep.UpdateFunction(t, nodejs12Cfg.Fn, "Update NodeJS Function", runtimes.GetUpdatedNodeJSFunction()),
teststep.NewE2EFunctionCheck(t, "NodeJS post update e2e check", nodejs12Cfg.InClusterURL, nodejs12Cfg.APIRuleURL, nodejs12Cfg.BrokerURL, poll),
teststep.NewHTTPCheck(t, "NodeJS12 pre update simple check through service", nodejs12Cfg.APIRuleURL, poll, "Hello From nodejs"),
teststep.NewHTTPCheck(t, "NodeJS12 pre update simple check through gateway", nodejs12Cfg.InClusterURL, poll, "Hello From nodejs"),
teststep.UpdateFunction(t, nodejs12Cfg.Fn, "Update NodeJS12 Function", runtimes.GetUpdatedNodeJSFunction()),
teststep.NewE2EFunctionCheck(t, "NodeJS12 post update e2e check", nodejs12Cfg.InClusterURL, nodejs12Cfg.APIRuleURL, nodejs12Cfg.BrokerURL, poll),
)),
}, nil
}

0 comments on commit 0e52cb8

Please sign in to comment.