You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by ve...@apache.org on 2015/12/17 05:50:15 UTC
[3/3] sqoop git commit: SQOOP-2747: Allow customizing test username
and password for Oracle tests (Jarek Jarcec Cecho via Venkat Ranganathan)
SQOOP-2747: Allow customizing test username and password for Oracle tests
(Jarek Jarcec Cecho via Venkat Ranganathan)
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/f19e2a52
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/f19e2a52
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/f19e2a52
Branch: refs/heads/trunk
Commit: f19e2a523579db8c28a96febfd3cf35a5d58adc6
Parents: e4f12a9
Author: Venkat Ranganathan <ve...@hortonworks.com>
Authored: Wed Dec 16 20:49:31 2015 -0800
Committer: Venkat Ranganathan <ve...@hortonworks.com>
Committed: Wed Dec 16 20:49:31 2015 -0800
----------------------------------------------------------------------
build.xml | 11 +++++++++--
src/test/com/cloudera/sqoop/manager/OracleUtils.java | 8 +++-----
2 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/f19e2a52/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 148cc6d..97e5502 100644
--- a/build.xml
+++ b/build.xml
@@ -350,8 +350,9 @@
value="${name}/[conf]/[artifact]-[revision](-[classifier]).[ext]"/>
<!--test related properties -->
- <property name="sqoop.test.oracle.connectstring"
- value="jdbc:oracle:thin:@//localhost/xe"/>
+ <property name="sqoop.test.oracle.connectstring" value="jdbc:oracle:thin:@//localhost/xe"/>
+ <property name="sqoop.test.oracle.username" value="SQOOPTEST"/>
+ <property name="sqoop.test.oracle.password" value="12345"/>
<property name="sqoop.test.mysql.connectstring.host_url"
value="jdbc:mysql://localhost/"/>
@@ -954,6 +955,12 @@
<sysproperty key="sqoop.test.oracle.connectstring"
value="${sqoop.test.oracle.connectstring}"/>
+ <sysproperty key="sqoop.test.oracle.username"
+ value="${sqoop.test.oracle.username}"/>
+
+ <sysproperty key="sqoop.test.oracle.password"
+ value="${sqoop.test.oracle.password}"/>
+
<sysproperty key="sqoop.test.mysql.connectstring.host_url"
value="${sqoop.test.mysql.connectstring.host_url}"/>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/f19e2a52/src/test/com/cloudera/sqoop/manager/OracleUtils.java
----------------------------------------------------------------------
diff --git a/src/test/com/cloudera/sqoop/manager/OracleUtils.java b/src/test/com/cloudera/sqoop/manager/OracleUtils.java
index d9e31b8..655aa61 100644
--- a/src/test/com/cloudera/sqoop/manager/OracleUtils.java
+++ b/src/test/com/cloudera/sqoop/manager/OracleUtils.java
@@ -37,11 +37,9 @@ public final class OracleUtils {
// Express edition hardcoded name.
public static final String ORACLE_DATABASE_NAME = "xe";
- public static final String CONNECT_STRING =
- System.getProperty("sqoop.test.oracle.connectstring",
- "jdbc:oracle:thin:@//localhost/" + ORACLE_DATABASE_NAME);
- public static final String ORACLE_USER_NAME = "SQOOPTEST";
- public static final String ORACLE_USER_PASS = "12345";
+ public static final String CONNECT_STRING = System.getProperty("sqoop.test.oracle.connectstring", "jdbc:oracle:thin:@//localhost/" + ORACLE_DATABASE_NAME);
+ public static final String ORACLE_USER_NAME = System.getProperty("sqoop.test.oracle.username", "SQOOPTEST");
+ public static final String ORACLE_USER_PASS = System.getProperty("sqoop.test.oracle.password", "12345");
public static final String ORACLE_SECONDARY_USER_NAME = "SQOOPTEST2";
public static final String ORACLE_SECONDARY_USER_PASS = "ABCDEF";