Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0B52B200D0B for ; Tue, 29 Aug 2017 07:07:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 07CEE1660CB; Tue, 29 Aug 2017 05:07:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2858A1660C9 for ; Tue, 29 Aug 2017 07:07:05 +0200 (CEST) Received: (qmail 14910 invoked by uid 500); 29 Aug 2017 05:07:04 -0000 Mailing-List: contact commits-help@openwhisk.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwhisk.apache.org Delivered-To: mailing list commits@openwhisk.apache.org Received: (qmail 14900 invoked by uid 99); 29 Aug 2017 05:07:04 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Aug 2017 05:07:04 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C97EC816C4; Tue, 29 Aug 2017 05:07:02 +0000 (UTC) Date: Tue, 29 Aug 2017 05:07:02 +0000 To: "commits@openwhisk.apache.org" Subject: [incubator-openwhisk-wskdeploy] branch master updated: Rename the names of packages to avoid concurrency (#404) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <150398322210.11209.9198047657893341576@gitbox.apache.org> From: mrutkowski@apache.org Reply-To: "commits@openwhisk.apache.org" X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-openwhisk-wskdeploy X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: cfb971e42dbca2c5841e9729769855ac440c761f X-Git-Newrev: 5c8b8b821abf31e113a6822800c445eb0b0cafbb X-Git-Rev: 5c8b8b821abf31e113a6822800c445eb0b0cafbb X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated archived-at: Tue, 29 Aug 2017 05:07:06 -0000 This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-wskdeploy.git The following commit(s) were added to refs/heads/master by this push: new 5c8b8b8 Rename the names of packages to avoid concurrency (#404) 5c8b8b8 is described below commit 5c8b8b821abf31e113a6822800c445eb0b0cafbb Author: Vincent AuthorDate: Tue Aug 29 01:06:59 2017 -0400 Rename the names of packages to avoid concurrency (#404) --- tests/src/integration/common/wskdeploy.go | 10 +++++++++- tests/src/integration/flagstests/deployment.yml | 2 +- tests/src/integration/flagstests/flags_test.go | 14 +++++++++++++- tests/src/integration/flagstests/manifest.yaml | 6 +++--- tests/src/integration/flagstests/manifest.yml | 4 ++-- tests/src/integration/jaraction/jaraction_test.go | 2 +- tests/src/integration/triggerrule/deployment.yml | 2 +- tests/src/integration/triggerrule/manifest.yml | 8 ++++---- tests/src/integration/zipaction/zipaction_test.go | 2 +- 9 files changed, 35 insertions(+), 15 deletions(-) diff --git a/tests/src/integration/common/wskdeploy.go b/tests/src/integration/common/wskdeploy.go index 7e8e29d..b1946ce 100644 --- a/tests/src/integration/common/wskdeploy.go +++ b/tests/src/integration/common/wskdeploy.go @@ -86,6 +86,14 @@ func (wskdeploy *Wskdeploy) DeployProjectPathOnly(projectPath string) ([]byte, e return wskdeploy.RunCommand("-p", projectPath) } +func (wskdeploy *Wskdeploy) UndeployProjectPathOnly(projectPath string) ([]byte, error) { + return wskdeploy.RunCommand("undeploy", "-p", projectPath) +} + func (wskdeploy *Wskdeploy) DeployManifestPathOnly(manifestpath string) ([]byte, error) { - return wskdeploy.RunCommand("-p", manifestpath) + return wskdeploy.RunCommand("-m", manifestpath) +} + +func (wskdeploy *Wskdeploy) UndeployManifestPathOnly(manifestpath string) ([]byte, error) { + return wskdeploy.RunCommand("undeploy", "-m", manifestpath) } diff --git a/tests/src/integration/flagstests/deployment.yml b/tests/src/integration/flagstests/deployment.yml index 848e52d..c37e706 100644 --- a/tests/src/integration/flagstests/deployment.yml +++ b/tests/src/integration/flagstests/deployment.yml @@ -3,7 +3,7 @@ application: package: triggerrule: - name: helloworld + name: helloWorldFlags namespace: guest actions: greeting: diff --git a/tests/src/integration/flagstests/flags_test.go b/tests/src/integration/flagstests/flags_test.go index 8f71a2c..675504e 100644 --- a/tests/src/integration/flagstests/flags_test.go +++ b/tests/src/integration/flagstests/flags_test.go @@ -1,4 +1,4 @@ -// +build not_integration +// +build integration /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -34,6 +34,8 @@ func TestSupportProjectPath(t *testing.T) { projectPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests" _, 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") } // support only projectpath with trailing slash @@ -42,6 +44,8 @@ func TestSupportProjectPathTrailingSlash(t *testing.T) { projectPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests" + "/" _, 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") } // only a yaml manifest @@ -50,6 +54,8 @@ func TestSupportManifestYamlPath(t *testing.T) { manifestPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests/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") } // only a yml manifest @@ -58,6 +64,8 @@ func TestSupportManifestYmlPath(t *testing.T) { manifestPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests/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") } // manifest yaml and deployment yaml @@ -67,6 +75,8 @@ func TestSupportManifestYamlDeployment(t *testing.T) { deploymentPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests/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.") } // manifest yml and deployment yaml @@ -76,4 +86,6 @@ func TestSupportManifestYmlDeployment(t *testing.T) { deploymentPath := os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/flagstests/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.") } diff --git a/tests/src/integration/flagstests/manifest.yaml b/tests/src/integration/flagstests/manifest.yaml index 0785fd9..d119fca 100644 --- a/tests/src/integration/flagstests/manifest.yaml +++ b/tests/src/integration/flagstests/manifest.yaml @@ -1,5 +1,5 @@ package: - name: helloworld + name: helloWorldFlags version: 1.0 license: Apache-2.0 actions: @@ -14,10 +14,10 @@ package: outputs: payload: string triggers: - locationUpdate: + locationUpdateFlags: rules: myRule: - trigger: locationUpdate + trigger: locationUpdateFlags #the action name and the action file greeting.js should consistent. #currently the implementation deside the action name consistent with action file name? action: greeting diff --git a/tests/src/integration/flagstests/manifest.yml b/tests/src/integration/flagstests/manifest.yml index 0785fd9..5080c6e 100644 --- a/tests/src/integration/flagstests/manifest.yml +++ b/tests/src/integration/flagstests/manifest.yml @@ -14,10 +14,10 @@ package: outputs: payload: string triggers: - locationUpdate: + locationUpdateFlags: rules: myRule: - trigger: locationUpdate + trigger: locationUpdateFlags #the action name and the action file greeting.js should consistent. #currently the implementation deside the action name consistent with action file name? action: greeting diff --git a/tests/src/integration/jaraction/jaraction_test.go b/tests/src/integration/jaraction/jaraction_test.go index 49c77d0..7cb7c3b 100644 --- a/tests/src/integration/jaraction/jaraction_test.go +++ b/tests/src/integration/jaraction/jaraction_test.go @@ -1,4 +1,4 @@ -// +build not_integration +// +build integration /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/tests/src/integration/triggerrule/deployment.yml b/tests/src/integration/triggerrule/deployment.yml index 848e52d..27b32e4 100644 --- a/tests/src/integration/triggerrule/deployment.yml +++ b/tests/src/integration/triggerrule/deployment.yml @@ -3,7 +3,7 @@ application: package: triggerrule: - name: helloworld + name: helloWorldTriggerRule namespace: guest actions: greeting: diff --git a/tests/src/integration/triggerrule/manifest.yml b/tests/src/integration/triggerrule/manifest.yml index ce324be..6776b7c 100644 --- a/tests/src/integration/triggerrule/manifest.yml +++ b/tests/src/integration/triggerrule/manifest.yml @@ -1,5 +1,5 @@ package: - name: helloworld + name: helloWorldTriggerRule version: 1.0 license: Apache-2.0 actions: @@ -13,10 +13,10 @@ package: outputs: payload: string triggers: - locationUpdate: + locationUpdateTriggerRule: rules: - myRule: - trigger: locationUpdate + myRuleTriggerRule: + trigger: locationUpdateTriggerRule #the action name and the action file greeting.js should consistent. #currently the implementation decide the action name consistent with action file name? action: greeting diff --git a/tests/src/integration/zipaction/zipaction_test.go b/tests/src/integration/zipaction/zipaction_test.go index cb15bee..70b6bb9 100644 --- a/tests/src/integration/zipaction/zipaction_test.go +++ b/tests/src/integration/zipaction/zipaction_test.go @@ -1,4 +1,4 @@ -// +build not_integration +// +build integration /* * Licensed to the Apache Software Foundation (ASF) under one or more -- To stop receiving notification emails like this one, please contact ['"commits@openwhisk.apache.org" '].