svn commit: r1202902 - in /incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/src/main/groovy/org/apache/bigtop/itest/integration/sqoop: IntegrationTestSqoopHBase.groovy IntegrationTestSqoopHive.groovy

[rvs]

Author: rvs
Date: Wed Nov 16 22:01:30 2011
New Revision: 1202902

URL: http://svn.apache.org/viewvc?rev=1202902&view=rev
Log:
BIGTOP-258. Compilation Error in sqoop-integration project when using Eclipse 
(Will McQueen via rvs)

Modified:
    
incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/src/main/groovy/org/apache/bigtop/itest/integration/sqoop/IntegrationTestSqoopHBase.groovy
    
incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/src/main/groovy/org/apache/bigtop/itest/integration/sqoop/IntegrationTestSqoopHive.groovy

Modified: 
incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/src/main/groovy/org/apache/bigtop/itest/integration/sqoop/IntegrationTestSqoopHBase.groovy
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/src/main/groovy/org/apache/bigtop/itest/integration/sqoop/IntegrationTestSqoopHBase.groovy?rev=1202902&r1=1202901&r2=1202902&view=diff
==============================================================================
--- 
incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/src/main/groovy/org/apache/bigtop/itest/integration/sqoop/IntegrationTestSqoopHBase.groovy
 (original)
+++ 
incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/src/main/groovy/org/apache/bigtop/itest/integration/sqoop/IntegrationTestSqoopHBase.groovy
 Wed Nov 16 22:01:30 2011
@@ -73,10 +73,8 @@ public class IntegrationTestSqoopHBase {
   public void setUp () {
     JarContent.unpackJarContainer(IntegrationTestSqoopHBase.class, '.', 
DATA_DIR);
 
-    if (!"".equals(MYSQL_ROOTPW))
-      MYSQL_ROOTPW = " -p$MYSQL_ROOTPW";
     rmr('test_table');
-    shell.exec("cat $DATA_DIR/mysql-create-db.sql | $MYSQL_COMMAND -u root 
$MYSQL_ROOTPW");
+    shell.exec("cat $DATA_DIR/mysql-create-db.sql | $MYSQL_COMMAND -u root 
${''.equals(MYSQL_ROOTPW) ?: '-p' + MYSQL_ROOTPW}");
     assertEquals('Unable to run mysql-create-db.sql script', 0, 
shell.getRet());
     shell.exec("cat $DATA_DIR/mysql-load-db.sql | $MYSQL_COMMAND -u root 
testhbase");
     assertEquals('Unable to run mysql-load-db.sql script', 0, shell.getRet());

Modified: 
incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/src/main/groovy/org/apache/bigtop/itest/integration/sqoop/IntegrationTestSqoopHive.groovy
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/src/main/groovy/org/apache/bigtop/itest/integration/sqoop/IntegrationTestSqoopHive.groovy?rev=1202902&r1=1202901&r2=1202902&view=diff
==============================================================================
--- 
incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/src/main/groovy/org/apache/bigtop/itest/integration/sqoop/IntegrationTestSqoopHive.groovy
 (original)
+++ 
incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/src/main/groovy/org/apache/bigtop/itest/integration/sqoop/IntegrationTestSqoopHive.groovy
 Wed Nov 16 22:01:30 2011
@@ -62,11 +62,10 @@ class IntegrationTestSqoopHive {
   @Before
   public void setUp () {
     JarContent.unpackJarContainer(IntegrationTestSqoopHive.class, '.', 
DATA_DIR);
+
     // MySQL preparations
-    if (!"".equals(MYSQL_ROOTPW))
-      MYSQL_ROOTPW = " -p$MYSQL_ROOTPW";
     rmr('test_table');
-    shell.exec("cat $DATA_DIR/mysql-create-db.sql | $MYSQL_COMMAND -u root 
$MYSQL_ROOTPW");
+    shell.exec("cat $DATA_DIR/mysql-create-db.sql | $MYSQL_COMMAND -u root 
${''.equals(MYSQL_ROOTPW) ?: '-p' + MYSQL_ROOTPW}");
     assertEquals('Unable to run mysql-create-db.sql script', 0, 
shell.getRet());
     shell.exec("cat $DATA_DIR/mysql-load-db.sql | $MYSQL_COMMAND -u 
testhiveuser testhive");
     assertEquals('Unable to run mysql-load-db.sql script', 0, shell.getRet());