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

e2e for runtime version 1.4.0 (#796) 

* check upgrade path for runtime version 1.4.0-rc.6

* Fix code typo

* fix shutdown api usage in test

* fix e2e tests for latest version
This commit is contained in:
Mukundan Sundararajan 2021-09-22 09:25:00 +05:30 committed by GitHub
parent 909b989128
commit 57bf146dfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -24,3 +24,5 @@ cli
# CLI's auto-generated components directory # CLI's auto-generated components directory
**/components **/components
test_output.json

6
tests/e2e/standalone/standalone_test.go
View File

@ -32,8 +32,8 @@ import (
) )
const ( const (
daprRuntimeVersion = "1.3.0" daprRuntimeVersion = "1.4.0"
daprDashboardVersion = "0.7.0" daprDashboardVersion = "0.8.0"
) )
func TestStandaloneInstall(t *testing.T) { func TestStandaloneInstall(t *testing.T) {
@ -364,7 +364,7 @@ func testRun(t *testing.T) {
t.Run("API shutdown", func(t *testing.T) { t.Run("API shutdown", func(t *testing.T) {
// Test that the CLI exits on a daprd shutdown. // Test that the CLI exits on a daprd shutdown.
output, err := spawn.Command(daprPath, "run", "--dapr-http-port", "9999", "--", "bash", "-c", "curl -v http://localhost:9999/v1.0/shutdown; sleep 10; exit 1") output, err := spawn.Command(daprPath, "run", "--dapr-http-port", "9999", "--", "bash", "-c", "curl -v -X POST http://localhost:9999/v1.0/shutdown; sleep 10; exit 1")
t.Log(output) t.Log(output)
require.NoError(t, err, "run failed") require.NoError(t, err, "run failed")
assert.Contains(t, output, "Exited App successfully", "App should be shutdown before it has a chance to return non-zero") assert.Contains(t, output, "Exited App successfully", "App should be shutdown before it has a chance to return non-zero")

54
tests/e2e/upgrade/upgrade_test.go
View File

@ -21,38 +21,6 @@ type upgradePath struct {
var ( var (
supportedUpgradePaths = []upgradePath{ supportedUpgradePaths = []upgradePath{
{
previous: common.VersionDetails{
RuntimeVersion: "1.1.0",
DashboardVersion: "0.6.0",
ClusterRoles: []string{"dapr-operator-admin", "dashboard-reader"},
ClusterRoleBindings: []string{"dapr-operator", "dapr-role-tokenreview-binding", "dashboard-reader-global"},
CustomResourceDefs: []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io"},
},
next: common.VersionDetails{
RuntimeVersion: "1.1.1",
DashboardVersion: "0.6.0",
ClusterRoles: []string{"dapr-operator-admin", "dashboard-reader"},
ClusterRoleBindings: []string{"dapr-operator", "dapr-role-tokenreview-binding", "dashboard-reader-global"},
CustomResourceDefs: []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io"},
},
},
{
previous: common.VersionDetails{
RuntimeVersion: "1.1.1",
DashboardVersion: "0.6.0",
ClusterRoles: []string{"dapr-operator-admin", "dashboard-reader"},
ClusterRoleBindings: []string{"dapr-operator", "dapr-role-tokenreview-binding", "dashboard-reader-global"},
CustomResourceDefs: []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io"},
},
next: common.VersionDetails{
RuntimeVersion: "1.1.2",
DashboardVersion: "0.6.0",
ClusterRoles: []string{"dapr-operator-admin", "dashboard-reader"},
ClusterRoleBindings: []string{"dapr-operator", "dapr-role-tokenreview-binding", "dashboard-reader-global"},
CustomResourceDefs: []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io"},
},
},
{ {
previous: common.VersionDetails{ previous: common.VersionDetails{
RuntimeVersion: "1.1.2", RuntimeVersion: "1.1.2",
@ -87,19 +55,35 @@ var (
}, },
{ {
previous: common.VersionDetails{ previous: common.VersionDetails{
RuntimeVersion: "1.2.2", RuntimeVersion: "1.3.0",
DashboardVersion: "0.6.0", DashboardVersion: "0.7.0",
ClusterRoles: []string{"dapr-operator-admin", "dashboard-reader"}, ClusterRoles: []string{"dapr-operator-admin", "dashboard-reader"},
ClusterRoleBindings: []string{"dapr-operator", "dapr-role-tokenreview-binding", "dashboard-reader-global"}, ClusterRoleBindings: []string{"dapr-operator", "dapr-role-tokenreview-binding", "dashboard-reader-global"},
CustomResourceDefs: []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io"}, CustomResourceDefs: []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io"},
}, },
next: common.VersionDetails{ next: common.VersionDetails{
RuntimeVersion: "1.3.0", RuntimeVersion: "1.4.0",
DashboardVersion: "0.8.0",
ClusterRoles: []string{"dapr-operator-admin", "dashboard-reader"},
ClusterRoleBindings: []string{"dapr-operator", "dapr-role-tokenreview-binding", "dashboard-reader-global"},
CustomResourceDefs: []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io"},
},
},
{
previous: common.VersionDetails{
RuntimeVersion: "1.3.1",
DashboardVersion: "0.7.0", DashboardVersion: "0.7.0",
ClusterRoles: []string{"dapr-operator-admin", "dashboard-reader"}, ClusterRoles: []string{"dapr-operator-admin", "dashboard-reader"},
ClusterRoleBindings: []string{"dapr-operator", "dapr-role-tokenreview-binding", "dashboard-reader-global"}, ClusterRoleBindings: []string{"dapr-operator", "dapr-role-tokenreview-binding", "dashboard-reader-global"},
CustomResourceDefs: []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io"}, CustomResourceDefs: []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io"},
}, },
next: common.VersionDetails{
RuntimeVersion: "1.4.0",
DashboardVersion: "0.8.0",
ClusterRoles: []string{"dapr-operator-admin", "dashboard-reader"},
ClusterRoleBindings: []string{"dapr-operator", "dapr-role-tokenreview-binding", "dashboard-reader-global"},
CustomResourceDefs: []string{"components.dapr.io", "configurations.dapr.io", "subscriptions.dapr.io"},
},
}, },
} }
) )