You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2017/12/01 01:30:10 UTC
[GitHub] mrutkows closed pull request #655: an attempt to fix concurrency issue by enforcing to run tests in sequence
mrutkows closed pull request #655: an attempt to fix concurrency issue by enforcing to run tests in sequence
URL: https://github.com/apache/incubator-openwhisk-wskdeploy/pull/655
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/Makefile b/Makefile
index 25cab45..b8c2d20 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ build: test
# Run the integration test against OpenWhisk
integration_test:
@echo "Launch the integration tests."
- go test -v ./... -tags=integration
+ go test -p 1 -v ./... -tags=integration
format:
@echo "Formatting"
diff --git a/tests/src/integration/apigateway/apigateway_test.go b/tests/src/integration/apigateway/apigateway_test.go
index 7723b15..529a3df 100644
--- a/tests/src/integration/apigateway/apigateway_test.go
+++ b/tests/src/integration/apigateway/apigateway_test.go
@@ -24,6 +24,7 @@ import (
"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
"github.com/stretchr/testify/assert"
"os"
+ "time"
)
// TODO: write the integration against openwhisk
@@ -32,6 +33,9 @@ func TestTriggerRule(t *testing.T) {
manifestPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/apigateway/manifest.yml"
_, err := wskdeploy.DeployManifestPathOnly(manifestPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest file.")
+
+ time.Sleep(time.Second * 5)
+
_, err = wskdeploy.UndeployManifestPathOnly(manifestPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest file.")
}
diff --git a/tests/src/integration/dependency/dependency_test.go b/tests/src/integration/dependency/dependency_test.go
index e5ca7cc..1743642 100644
--- a/tests/src/integration/dependency/dependency_test.go
+++ b/tests/src/integration/dependency/dependency_test.go
@@ -24,6 +24,7 @@ import (
"github.com/stretchr/testify/assert"
"os"
"testing"
+ "time"
)
@@ -34,6 +35,9 @@ func TestDependency(t *testing.T) {
wskdeploy := common.NewWskdeploy()
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files.")
+
+ time.Sleep(time.Second * 5)
+
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files.")
}
diff --git a/tests/src/integration/flagstests/flags_test.go b/tests/src/integration/flagstests/flags_test.go
index 675504e..ade8feb 100644
--- a/tests/src/integration/flagstests/flags_test.go
+++ b/tests/src/integration/flagstests/flags_test.go
@@ -24,68 +24,90 @@ import (
"github.com/stretchr/testify/assert"
"os"
"testing"
+ "time"
)
var wskprops = common.GetWskprops()
+const PATH = "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests/"
+
// support only projectpath flag
func TestSupportProjectPath(t *testing.T) {
+ t.Parallel()
wskdeploy := common.NewWskdeploy()
- projectPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests"
+ projectPath := os.Getenv("GOPATH") + PATH
_, err := wskdeploy.DeployProjectPathOnly(projectPath)
assert.Equal(t, nil, err, "Failed to deploy based on the projectpath")
- _, err = wskdeploy.UndeployProjectPathOnly(projectPath)
- assert.Equal(t, nil, err, "Failed to undeploy based on the projectpath")
+
+ time.Sleep(time.Second * 2)
+
+ _, err = wskdeploy.UndeployProjectPathOnly(projectPath)
+ assert.Equal(t, nil, err, "Failed to undeploy based on the projectpath")
}
// support only projectpath with trailing slash
func TestSupportProjectPathTrailingSlash(t *testing.T) {
wskdeploy := common.NewWskdeploy()
- projectPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests" + "/"
+ projectPath := os.Getenv("GOPATH") + PATH
_, err := wskdeploy.DeployProjectPathOnly(projectPath)
assert.Equal(t, nil, err, "Failed to deploy based on the projectpath")
- _, err = wskdeploy.UndeployProjectPathOnly(projectPath)
- assert.Equal(t, nil, err, "Failed to undeploy based on the projectpath")
+
+ time.Sleep(time.Second * 2)
+
+ _, err = wskdeploy.UndeployProjectPathOnly(projectPath)
+ assert.Equal(t, nil, err, "Failed to undeploy based on the projectpath")
}
// only a yaml manifest
func TestSupportManifestYamlPath(t *testing.T) {
wskdeploy := common.NewWskdeploy()
- manifestPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests/manifest.yaml"
+ manifestPath := os.Getenv("GOPATH") + PATH + "manifest.yaml"
_, err := wskdeploy.DeployManifestPathOnly(manifestPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifestpath")
- _, err = wskdeploy.UndeployManifestPathOnly(manifestPath)
- assert.Equal(t, nil, err, "Failed to undeploy based on the manifestpath")
+
+ time.Sleep(time.Second * 2)
+
+ _, err = wskdeploy.UndeployManifestPathOnly(manifestPath)
+ assert.Equal(t, nil, err, "Failed to undeploy based on the manifestpath")
}
// only a yml manifest
func TestSupportManifestYmlPath(t *testing.T) {
wskdeploy := common.NewWskdeploy()
- manifestPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests/manifest.yml"
+ manifestPath := os.Getenv("GOPATH") + PATH + "manifest.yml"
_, err := wskdeploy.DeployManifestPathOnly(manifestPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifestpath")
- _, err = wskdeploy.UndeployManifestPathOnly(manifestPath)
- assert.Equal(t, nil, err, "Failed to undeploy based on the manifestpath")
+
+ time.Sleep(time.Second * 2)
+
+ _, err = wskdeploy.UndeployManifestPathOnly(manifestPath)
+ assert.Equal(t, nil, err, "Failed to undeploy based on the manifestpath")
}
// manifest yaml and deployment yaml
func TestSupportManifestYamlDeployment(t *testing.T) {
wskdeploy := common.NewWskdeploy()
- manifestPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests/manifest.yaml"
- deploymentPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests/deployment.yml"
- _, err := wskdeploy.Deploy(manifestPath,deploymentPath)
+ manifestPath := os.Getenv("GOPATH") + PATH + "manifest.yaml"
+ deploymentPath := os.Getenv("GOPATH") + PATH + "deployment.yml"
+ _, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifestpath and deploymentpath.")
- _, err = wskdeploy.Undeploy(manifestPath,deploymentPath)
- assert.Equal(t, nil, err, "Failed to undeploy based on the manifestpath and deploymentpath.")
+
+ time.Sleep(time.Second * 2)
+
+ _, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
+ assert.Equal(t, nil, err, "Failed to undeploy based on the manifestpath and deploymentpath.")
}
// manifest yml and deployment yaml
func TestSupportManifestYmlDeployment(t *testing.T) {
wskdeploy := common.NewWskdeploy()
- manifestPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests/manifest.yml"
- deploymentPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests/deployment.yml"
- _, err := wskdeploy.Deploy(manifestPath,deploymentPath)
+ manifestPath := os.Getenv("GOPATH") + PATH + "manifest.yml"
+ deploymentPath := os.Getenv("GOPATH") + PATH + "deployment.yml"
+ _, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifestpath and deploymentpath.")
- _, err = wskdeploy.Undeploy(manifestPath,deploymentPath)
- assert.Equal(t, nil, err, "Failed to undeploy based on the manifestpath and deploymentpath.")
+
+ time.Sleep(time.Second * 2)
+
+ _, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
+ assert.Equal(t, nil, err, "Failed to undeploy based on the manifestpath and deploymentpath.")
}
diff --git a/tests/src/integration/helloworld/helloworld_test.go b/tests/src/integration/helloworld/helloworld_test.go
index d5d38e4..750937d 100644
--- a/tests/src/integration/helloworld/helloworld_test.go
+++ b/tests/src/integration/helloworld/helloworld_test.go
@@ -24,12 +24,16 @@ import (
"github.com/stretchr/testify/assert"
"os"
"testing"
+ "time"
)
func TestHelloWorld(t *testing.T) {
wskdeploy := common.NewWskdeploy()
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files.")
+
+ time.Sleep(time.Second * 2)
+
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files.")
}
diff --git a/tests/src/integration/jaraction/jaraction_test.go b/tests/src/integration/jaraction/jaraction_test.go
index 3c9f464..06d29a6 100644
--- a/tests/src/integration/jaraction/jaraction_test.go
+++ b/tests/src/integration/jaraction/jaraction_test.go
@@ -24,6 +24,7 @@ import (
"github.com/stretchr/testify/assert"
"os"
"testing"
+ "time"
)
var wskprops = common.GetWskprops()
@@ -32,6 +33,9 @@ func TestJarAction(t *testing.T) {
wskdeploy := common.NewWskdeploy()
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files.")
+
+ time.Sleep(time.Second * 2)
+
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files.")
}
diff --git a/tests/src/integration/managed-deployment/managed-deployment_test.go b/tests/src/integration/managed-deployment/managed-deployment_test.go
index 10e8aa8..224981e 100644
--- a/tests/src/integration/managed-deployment/managed-deployment_test.go
+++ b/tests/src/integration/managed-deployment/managed-deployment_test.go
@@ -24,6 +24,7 @@ import (
"github.com/stretchr/testify/assert"
"os"
"testing"
+ "time"
)
func TestManagedDeployment(t *testing.T) {
@@ -34,26 +35,36 @@ func TestManagedDeployment(t *testing.T) {
_, err := wskdeploy.ManagedDeployment(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files.")
+ time.Sleep(time.Second * 2)
+
manifestPath = os.Getenv("GOPATH") + path + "00-manifest-minus-second-package.yaml"
wskdeploy = common.NewWskdeploy()
_, err = wskdeploy.ManagedDeployment(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files.")
+ time.Sleep(time.Second * 2)
+
manifestPath = os.Getenv("GOPATH") + path + "01-manifest-minus-sequence-2.yaml"
wskdeploy = common.NewWskdeploy()
_, err = wskdeploy.ManagedDeployment(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files.")
+ time.Sleep(time.Second * 2)
+
manifestPath = os.Getenv("GOPATH") + path + "02-manifest-minus-action-3.yaml"
wskdeploy = common.NewWskdeploy()
_, err = wskdeploy.ManagedDeployment(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files.")
+ time.Sleep(time.Second * 2)
+
manifestPath = os.Getenv("GOPATH") + path + "03-manifest-minus-trigger.yaml"
wskdeploy = common.NewWskdeploy()
_, err = wskdeploy.ManagedDeployment(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files.")
+ time.Sleep(time.Second * 2)
+
manifestPath = os.Getenv("GOPATH") + path + "04-manifest-minus-package.yaml"
wskdeploy = common.NewWskdeploy()
_, err = wskdeploy.ManagedDeployment(manifestPath, deploymentPath)
diff --git a/tests/src/integration/runtimetests/runtimes_test.go b/tests/src/integration/runtimetests/runtimes_test.go
index 340c992..2d34305 100644
--- a/tests/src/integration/runtimetests/runtimes_test.go
+++ b/tests/src/integration/runtimetests/runtimes_test.go
@@ -24,14 +24,17 @@ import (
"github.com/stretchr/testify/assert"
"os"
"testing"
+ "time"
)
func TestExplicitRuntimes(t *testing.T) {
wskdeploy := common.NewWskdeploy()
- projectPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/runtimetests"
- _, err := wskdeploy.DeployProjectPathOnly(projectPath)
+ projectPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/runtimetests"
+ _, err := wskdeploy.DeployProjectPathOnly(projectPath)
assert.Equal(t, nil, err, "Failed to deploy based on the project path")
- _, err = wskdeploy.UndeployProjectPathOnly(projectPath)
- assert.Equal(t, nil, err, "Failed to undeploy based on the project path")
-}
+ time.Sleep(time.Second * 2)
+
+ _, err = wskdeploy.UndeployProjectPathOnly(projectPath)
+ assert.Equal(t, nil, err, "Failed to undeploy based on the project path")
+}
diff --git a/tests/src/integration/triggerrule/triggerrule_test.go b/tests/src/integration/triggerrule/triggerrule_test.go
index b93b8e9..c39c4fb 100644
--- a/tests/src/integration/triggerrule/triggerrule_test.go
+++ b/tests/src/integration/triggerrule/triggerrule_test.go
@@ -24,6 +24,7 @@ import (
"github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/common"
"github.com/stretchr/testify/assert"
"os"
+ "time"
)
var wskprops = common.GetWskprops()
@@ -33,6 +34,9 @@ func TestTriggerRule(t *testing.T) {
wskdeploy := common.NewWskdeploy()
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files.")
+
+ time.Sleep(time.Second * 2)
+
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files.")
}
diff --git a/tests/src/integration/validate-action-annotations/validate-action-annotations_test.go b/tests/src/integration/validate-action-annotations/validate-action-annotations_test.go
index f48aa29..6281771 100644
--- a/tests/src/integration/validate-action-annotations/validate-action-annotations_test.go
+++ b/tests/src/integration/validate-action-annotations/validate-action-annotations_test.go
@@ -24,16 +24,19 @@ import (
"github.com/stretchr/testify/assert"
"os"
"testing"
+ "time"
)
var path = "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/validate-action-annotations/"
func TestActionAnnotations(t *testing.T) {
+ t.Parallel()
manifestPath := os.Getenv("GOPATH") + path + "manifest.yaml"
deploymentPath := os.Getenv("GOPATH") + path + "deployment.yaml"
wskdeploy := common.NewWskdeploy()
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files.")
+ time.Sleep(time.Second * 2)
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files.")
}
diff --git a/tests/src/integration/validate-application-and-project/validate-application-and-project_test.go b/tests/src/integration/validate-application-and-project/validate-application-and-project_test.go
index a110ef2..adc1e63 100644
--- a/tests/src/integration/validate-application-and-project/validate-application-and-project_test.go
+++ b/tests/src/integration/validate-application-and-project/validate-application-and-project_test.go
@@ -24,6 +24,7 @@ import (
"github.com/stretchr/testify/assert"
"os"
"testing"
+ "time"
)
var path = "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/validate-application-and-project/"
@@ -34,6 +35,7 @@ func TestApplicationInDeployment(t *testing.T) {
wskdeploy := common.NewWskdeploy()
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files.")
+ time.Sleep(time.Second * 2)
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files.")
}
@@ -44,6 +46,7 @@ func TestProjectInDeployment(t *testing.T) {
wskdeploy := common.NewWskdeploy()
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files.")
+ time.Sleep(time.Second * 2)
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files.")
}
diff --git a/tests/src/integration/validate-binding-inputs-annotations/validate-bind-inputs-anno_test.go b/tests/src/integration/validate-binding-inputs-annotations/validate-bind-inputs-anno_test.go
index 8e0d159..0c10fbe 100644
--- a/tests/src/integration/validate-binding-inputs-annotations/validate-bind-inputs-anno_test.go
+++ b/tests/src/integration/validate-binding-inputs-annotations/validate-bind-inputs-anno_test.go
@@ -24,6 +24,7 @@ import (
"github.com/stretchr/testify/assert"
"os"
"testing"
+ "time"
)
var PATH = "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/validate-binding-inputs-annotations/"
@@ -150,6 +151,7 @@ func TestBindingInputsAnnotations(t *testing.T) {
// testing deploy and undeploy
_, err = wskdeploy.Deploy(manifestPath, deploymentPath)
assert.NoError(t, err, "Failed to deploy based on the manifest and deployment files.")
+ time.Sleep(time.Second * 2)
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.NoError(t, err, "Failed to undeploy based on the manifest and deployment files.")
}
diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/validate-file-extensions_test.go b/tests/src/integration/validate-manifest-deployment-file-extensions/validate-file-extensions_test.go
index 77c3e6e..ae46176 100644
--- a/tests/src/integration/validate-manifest-deployment-file-extensions/validate-file-extensions_test.go
+++ b/tests/src/integration/validate-manifest-deployment-file-extensions/validate-file-extensions_test.go
@@ -24,16 +24,19 @@ import (
"github.com/stretchr/testify/assert"
"os"
"testing"
+ "time"
)
var projectPath = "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/validate-manifest-deployment-file-extensions/"
func TestYAMLExtension(t *testing.T) {
+ t.Parallel()
manifestPath := os.Getenv("GOPATH") + projectPath + "manifest.yaml"
deploymentPath := os.Getenv("GOPATH") + projectPath + "deployment.yaml"
wskdeploy := common.NewWskdeploy()
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files with .yaml extension.")
+ time.Sleep(time.Second * 2)
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files with .yaml extension.")
}
@@ -44,6 +47,7 @@ func TestYMLExtension(t *testing.T) {
wskdeploy := common.NewWskdeploy()
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files with .yml extension.")
+ time.Sleep(time.Second * 2)
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files with .yml extension.")
}
@@ -54,6 +58,7 @@ func TestNonStandardFileNames(t *testing.T) {
wskdeploy := common.NewWskdeploy()
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files with non standard names.")
+ time.Sleep(time.Second * 2)
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files with non standard names.")
}
@@ -64,6 +69,7 @@ func TestRandomFileNames(t *testing.T) {
wskdeploy := common.NewWskdeploy()
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files with random names.")
+ time.Sleep(time.Second * 2)
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files with random names.")
}
@@ -74,6 +80,7 @@ func TestYAMLManifestWithYMLDeployment(t *testing.T) {
wskdeploy := common.NewWskdeploy()
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files with mix of .yaml and .yml extensions.")
+ time.Sleep(time.Second * 2)
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files with mix of .yaml and .yml extension.")
}
@@ -84,6 +91,7 @@ func TestYMLManifestWithYAMLDeployment(t *testing.T) {
wskdeploy := common.NewWskdeploy()
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files with .yml manifest and .yaml deployment file.")
+ time.Sleep(time.Second * 2)
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files with .yml manifest and .yaml deployment file.")
}
diff --git a/tests/src/integration/validate-package-in-manifest/manifest.yaml b/tests/src/integration/validate-package-in-manifest/manifest.yaml
index 961e83d..01e6c48 100644
--- a/tests/src/integration/validate-package-in-manifest/manifest.yaml
+++ b/tests/src/integration/validate-package-in-manifest/manifest.yaml
@@ -6,7 +6,7 @@ package:
myhelloworlds:
location: github.com/apache/incubator-openwhisk-test/packages/helloworlds
actions:
- helloNodejs-1:
+ helloNodejs-11:
function: actions/hello.js
runtime: nodejs:6
inputs:
@@ -20,10 +20,10 @@ package:
payload:
type: string
description: a simple greeting message, Hello World!
- helloNodejs-2:
+ helloNodejs-22:
function: actions/hello.js
runtime: nodejs:6
- helloNodejs-3:
+ helloNodejs-33:
function: actions/hello.js
runtime: nodejs:6
inputs:
@@ -34,11 +34,11 @@ package:
type: string
description: location of a person
sequences:
- helloworldnodejs-series:
- actions: helloNodejs-1, helloNodejs-2, helloNodejs-3, hellowhisk/greeting, hellowhisk/httpGet, myhelloworlds/hello-js
+ helloworldnodejs-series-1:
+ actions: helloNodejs-11, helloNodejs-22, helloNodejs-33, hellowhisk/greeting, hellowhisk/httpGet, myhelloworlds/hello-js
triggers:
triggerNodeJS:
rules:
ruleNodeJS:
trigger: triggerNodeJS
- action: helloworldnodejs-series
+ action: helloworldnodejs-series-1
diff --git a/tests/src/integration/validate-package-in-manifest/validate-package-in-manifest_test.go b/tests/src/integration/validate-package-in-manifest/validate-package-in-manifest_test.go
index 7dd5f05..4b3c430 100644
--- a/tests/src/integration/validate-package-in-manifest/validate-package-in-manifest_test.go
+++ b/tests/src/integration/validate-package-in-manifest/validate-package-in-manifest_test.go
@@ -24,12 +24,16 @@ import (
"github.com/stretchr/testify/assert"
"os"
"testing"
+ "time"
)
func TestPackageInManifest(t *testing.T) {
wskdeploy := common.NewWskdeploy()
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files.")
+
+ time.Sleep(time.Second * 10)
+
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files.")
}
diff --git a/tests/src/integration/validate-packages-in-manifest/validate-packages-in-manifest_test.go b/tests/src/integration/validate-packages-in-manifest/validate-packages-in-manifest_test.go
index 08c2e56..582758f 100644
--- a/tests/src/integration/validate-packages-in-manifest/validate-packages-in-manifest_test.go
+++ b/tests/src/integration/validate-packages-in-manifest/validate-packages-in-manifest_test.go
@@ -24,12 +24,16 @@ import (
"github.com/stretchr/testify/assert"
"os"
"testing"
+ "time"
)
func TestPackagesInManifest(t *testing.T) {
wskdeploy := common.NewWskdeploy()
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files.")
+
+ time.Sleep(time.Second * 5)
+
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files.")
}
diff --git a/tests/src/integration/validatePackagesInDeployment/validatePackagesInDeployment_test.go b/tests/src/integration/validatePackagesInDeployment/validatePackagesInDeployment_test.go
index b4c5297..818ddab 100644
--- a/tests/src/integration/validatePackagesInDeployment/validatePackagesInDeployment_test.go
+++ b/tests/src/integration/validatePackagesInDeployment/validatePackagesInDeployment_test.go
@@ -24,6 +24,7 @@ import (
"github.com/stretchr/testify/assert"
"os"
"testing"
+ "time"
)
var wskprops = common.GetWskprops()
@@ -32,6 +33,7 @@ func TestPackagesInDeploymentFile(t *testing.T) {
wskdeploy := common.NewWskdeploy()
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files.")
+ time.Sleep(time.Second * 2)
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files.")
}
diff --git a/tests/src/integration/webaction/webaction_test.go b/tests/src/integration/webaction/webaction_test.go
index 5ec81ca..d6a8190 100644
--- a/tests/src/integration/webaction/webaction_test.go
+++ b/tests/src/integration/webaction/webaction_test.go
@@ -24,6 +24,7 @@ import (
"github.com/stretchr/testify/assert"
"os"
"testing"
+ "time"
)
@@ -34,6 +35,7 @@ func TestWebAction(t *testing.T) {
wskdeploy := common.NewWskdeploy()
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest file.")
+ time.Sleep(time.Second * 2)
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest file.")
}
diff --git a/tests/src/integration/zipaction/zipaction_test.go b/tests/src/integration/zipaction/zipaction_test.go
index e39ddd6..c61b395 100644
--- a/tests/src/integration/zipaction/zipaction_test.go
+++ b/tests/src/integration/zipaction/zipaction_test.go
@@ -24,12 +24,14 @@ import (
"github.com/stretchr/testify/assert"
"os"
"testing"
+ "time"
)
func TestZipAction(t *testing.T) {
wskdeploy := common.NewWskdeploy()
_, err := wskdeploy.Deploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to deploy based on the manifest and deployment files.")
+ time.Sleep(time.Second * 2)
_, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and deployment files.")
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services