svn commit: r1363616 - in /whirr/trunk: CHANGES.txt services/cdh/src/test/java/org/apache/whirr/service/cdh/integration/CdhHadoopServiceTest.java

[tomwhite]

Author: tomwhite
Date: Fri Jul 20 01:52:38 2012
New Revision: 1363616

URL: http://svn.apache.org/viewvc?rev=1363616&view=rev
Log:
WHIRR-599. Whirr CDH4 CDHHadoopServiceTest.testVersion() is broken. Contributed 
by Andrew Bayer.

Modified:
    whirr/trunk/CHANGES.txt
    
whirr/trunk/services/cdh/src/test/java/org/apache/whirr/service/cdh/integration/CdhHadoopServiceTest.java

Modified: whirr/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1363616&r1=1363615&r2=1363616&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Fri Jul 20 01:52:38 2012
@@ -138,6 +138,9 @@ Trunk (unreleased changes)
     WHIRR-584. Change confusing ssh login help message at the end of
     deployment. (Andrew Bayer via tomwhite)
 
+    WHIRR-599. Whirr CDH4 CDHHadoopServiceTest.testVersion() is broken.
+    (Andrew Bayer via tomwhite)
+
 Release 0.7.1 - 2012-02-23
 
   IMPROVEMENTS

Modified: 
whirr/trunk/services/cdh/src/test/java/org/apache/whirr/service/cdh/integration/CdhHadoopServiceTest.java
URL: 
http://svn.apache.org/viewvc/whirr/trunk/services/cdh/src/test/java/org/apache/whirr/service/cdh/integration/CdhHadoopServiceTest.java?rev=1363616&r1=1363615&r2=1363616&view=diff
==============================================================================
--- 
whirr/trunk/services/cdh/src/test/java/org/apache/whirr/service/cdh/integration/CdhHadoopServiceTest.java
 (original)
+++ 
whirr/trunk/services/cdh/src/test/java/org/apache/whirr/service/cdh/integration/CdhHadoopServiceTest.java
 Fri Jul 20 01:52:38 2012
@@ -104,7 +104,7 @@ public class CdhHadoopServiceTest {
 
   @Test(timeout = TestConstants.ITEST_TIMEOUT)
   public void testVersion() throws Exception {
-    Statement checkVersion = Statements.exec("ls 
/etc/alternatives/hadoop-lib");
+    Statement checkVersion = Statements.exec("cat 
/usr/lib/hadoop/cloudera/cdh_version.properties");
     Map<? extends NodeMetadata, ExecResponse> responses =
        controller.runScriptOnNodesMatching(clusterSpec, ALL, checkVersion);