From commits-return-1099-apmail-apex-commits-archive=apex.apache.org@apex.incubator.apache.org Sun Oct 25 19:37:53 2015 Return-Path: X-Original-To: apmail-apex-commits-archive@minotaur.apache.org Delivered-To: apmail-apex-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8BA8A18F9C for ; Sun, 25 Oct 2015 19:37:53 +0000 (UTC) Received: (qmail 94178 invoked by uid 500); 25 Oct 2015 19:37:53 -0000 Delivered-To: apmail-apex-commits-archive@apex.apache.org Received: (qmail 94124 invoked by uid 500); 25 Oct 2015 19:37:53 -0000 Mailing-List: contact commits-help@apex.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@apex.incubator.apache.org Delivered-To: mailing list commits@apex.incubator.apache.org Received: (qmail 94070 invoked by uid 99); 25 Oct 2015 19:37:53 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Oct 2015 19:37:53 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id BCF13180F41 for ; Sun, 25 Oct 2015 19:37:52 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id GVSF9fvpiAhf for ; Sun, 25 Oct 2015 19:37:45 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 2B2AB23032 for ; Sun, 25 Oct 2015 19:37:45 +0000 (UTC) Received: (qmail 89542 invoked by uid 99); 25 Oct 2015 19:37:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Oct 2015 19:37:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D87C7DFF93; Sun, 25 Oct 2015 19:37:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vrozov@apache.org To: commits@apex.incubator.apache.org Date: Sun, 25 Oct 2015 19:38:03 -0000 Message-Id: <3ae96d98065e4032951496329fec480b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [20/36] incubator-apex-core git commit: APEX-198 Modify test to create user directory under target. APEX-198 Modify test to create user directory under target. Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/2c5ccb01 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/2c5ccb01 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/2c5ccb01 Branch: refs/heads/feature-module Commit: 2c5ccb0166addee37cedaa495de29824e0f499a0 Parents: 15ff42d Author: David Yan Authored: Tue Oct 20 14:50:02 2015 -0700 Committer: David Yan Committed: Tue Oct 20 15:37:04 2015 -0700 ---------------------------------------------------------------------- .../com/datatorrent/stram/cli/DTCliTest.java | 7 +++- .../resources/testAppPackage/.dt/dt-site.xml | 39 -------------------- .../test/resources/testAppPackage/dt-site.xml | 39 ++++++++++++++++++++ 3 files changed, 44 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/2c5ccb01/engine/src/test/java/com/datatorrent/stram/cli/DTCliTest.java ---------------------------------------------------------------------- diff --git a/engine/src/test/java/com/datatorrent/stram/cli/DTCliTest.java b/engine/src/test/java/com/datatorrent/stram/cli/DTCliTest.java index f8e1789..59a45aa 100644 --- a/engine/src/test/java/com/datatorrent/stram/cli/DTCliTest.java +++ b/engine/src/test/java/com/datatorrent/stram/cli/DTCliTest.java @@ -64,7 +64,10 @@ public class DTCliTest { try { userHome = System.getProperty("user.home"); - env.put("HOME", System.getProperty("user.dir") + "/src/test/resources/testAppPackage"); + String newHome = System.getProperty("user.dir") + "/target"; + FileUtils.forceMkdir(new File(newHome + "/.dt")); + FileUtils.copyFile(new File(System.getProperty("user.dir") + "/src/test/resources/testAppPackage/dt-site.xml"), new File(newHome + "/.dt/dt-site.xml")); + env.put("HOME", newHome); setEnv(env); cli.init(); @@ -83,7 +86,7 @@ public class DTCliTest public static void finished() { try { - env.put("HOME", System.getProperty("user.dir") + userHome); + env.put("HOME", userHome); setEnv(env); StramTestSupport.removeAppPackageFile(); http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/2c5ccb01/engine/src/test/resources/testAppPackage/.dt/dt-site.xml ---------------------------------------------------------------------- diff --git a/engine/src/test/resources/testAppPackage/.dt/dt-site.xml b/engine/src/test/resources/testAppPackage/.dt/dt-site.xml deleted file mode 100644 index f247ac9..0000000 --- a/engine/src/test/resources/testAppPackage/.dt/dt-site.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - dt.test.1 - user-home-config - - - dt.test.2 - user-home-config - - - dt.test.3 - user-home-config - - - dt.test.4 - user-home-config - - http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/2c5ccb01/engine/src/test/resources/testAppPackage/dt-site.xml ---------------------------------------------------------------------- diff --git a/engine/src/test/resources/testAppPackage/dt-site.xml b/engine/src/test/resources/testAppPackage/dt-site.xml new file mode 100644 index 0000000..f247ac9 --- /dev/null +++ b/engine/src/test/resources/testAppPackage/dt-site.xml @@ -0,0 +1,39 @@ + + + + + dt.test.1 + user-home-config + + + dt.test.2 + user-home-config + + + dt.test.3 + user-home-config + + + dt.test.4 + user-home-config + +