svn commit: r1363617 - in /whirr/branches/branch-0.7: CHANGES.txt services/cdh/src/test/java/org/apache/whirr/service/cdh/integration/CdhHadoopServiceTest.java

[tomwhite]

Author: tomwhite
Date: Fri Jul 20 01:56:44 2012
New Revision: 1363617

URL: http://svn.apache.org/viewvc?rev=1363617&view=rev
Log:
Merge -r 1363615:1363616 from trunk to branch-0.7. Fixes: WHIRR-599. Whirr CDH4 
CDHHadoopServiceTest.testVersion() is broken

Modified:
    whirr/branches/branch-0.7/CHANGES.txt
    
whirr/branches/branch-0.7/services/cdh/src/test/java/org/apache/whirr/service/cdh/integration/CdhHadoopServiceTest.java

Modified: whirr/branches/branch-0.7/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/whirr/branches/branch-0.7/CHANGES.txt?rev=1363617&r1=1363616&r2=1363617&view=diff
==============================================================================
--- whirr/branches/branch-0.7/CHANGES.txt (original)
+++ whirr/branches/branch-0.7/CHANGES.txt Fri Jul 20 01:56:44 2012
@@ -51,6 +51,9 @@ Release 0.7.2
     WHIRR-568. Use the correct CDH version/repository.
     (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/branches/branch-0.7/services/cdh/src/test/java/org/apache/whirr/service/cdh/integration/CdhHadoopServiceTest.java
URL: 
http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/cdh/src/test/java/org/apache/whirr/service/cdh/integration/CdhHadoopServiceTest.java?rev=1363617&r1=1363616&r2=1363617&view=diff
==============================================================================
--- 
whirr/branches/branch-0.7/services/cdh/src/test/java/org/apache/whirr/service/cdh/integration/CdhHadoopServiceTest.java
 (original)
+++ 
whirr/branches/branch-0.7/services/cdh/src/test/java/org/apache/whirr/service/cdh/integration/CdhHadoopServiceTest.java
 Fri Jul 20 01:56:44 2012
@@ -103,7 +103,7 @@ public class CdhHadoopServiceTest {
 
   @Test
   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);