You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2013/05/29 18:40:42 UTC
svn commit: r1487539 - in /incubator/ambari/trunk: ./
ambari-server/src/main/java/org/apache/ambari/server/utils/
ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/
ambari-server/src/test/java/org/apache/ambari/server/security/ am...
Author: smohanty
Date: Wed May 29 16:40:42 2013
New Revision: 1487539
URL: http://svn.apache.org/r1487539
Log:
AMBARI-2218. Unit test failures. (smohanty)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/utils/ShellCommandUtil.java
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/security/TestPassFileGeneration.java
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/utils/TestShellCommandUtil.java
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1487539&r1=1487538&r2=1487539&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed May 29 16:40:42 2013
@@ -904,6 +904,8 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-2218. Unit test failures. (smohanty)
+
AMBARI-2217. Increase ambari-agent test coverage. (smohanty)
AMBARI-2211. YARN does not show any configurations. (yusaku)
Modified: incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/utils/ShellCommandUtil.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/utils/ShellCommandUtil.java?rev=1487539&r1=1487538&r2=1487539&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/utils/ShellCommandUtil.java (original)
+++ incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/utils/ShellCommandUtil.java Wed May 29 16:40:42 2013
@@ -30,7 +30,7 @@ import java.io.InputStreamReader;
*/
public class ShellCommandUtil {
private static final Log LOG = LogFactory.getLog(ShellCommandUtil.class);
- private static Object WindowsProcessLaunchLock = new Object();
+ private static final Object WindowsProcessLaunchLock = new Object();
/*
public static String LogAndReturnOpenSslExitCode(String command, int exitCode) {
@@ -106,13 +106,13 @@ public class ShellCommandUtil {
/**
- * Gets file permissions on Unix-like systems.
- * Under Windows, command always returns MASK_EVERYBODY_RWX
+ * Gets file permissions on Linux systems.
+ * Under Windows/Mac, command always returns MASK_EVERYBODY_RWX
* @param path
*/
public static String getUnixFilePermissions(String path) {
- String result = null;
- if (UNIX_LIKE) {
+ String result = MASK_EVERYBODY_RWX;
+ if (LINUX) {
try {
result = runCommand(new String[]{"stat", "-c", "%a", path}).getStdout();
} catch (IOException e) {
@@ -123,20 +123,19 @@ public class ShellCommandUtil {
}
} else {
LOG.debug(String.format("Not performing stat -s \"%%a\" command on file %s " +
- "because current OS is not Unix-like. Returning 777", path));
- result = MASK_EVERYBODY_RWX;
+ "because current OS is not Linux. Returning 777", path));
}
return result.trim();
}
/**
- * Sets file permissions to a given value on Unix-like systems.
- * On Windows, command is silently ignored
- * @param path
+ * Sets file permissions to a given value on Linux systems.
+ * On Windows/Mac, command is silently ignored
* @param mode
+ * @param path
*/
public static void setUnixFilePermissions(String mode, String path) {
- if (UNIX_LIKE) {
+ if (LINUX) {
try {
runCommand(new String[]{"chmod", mode, path});
} catch (IOException e) {
@@ -147,7 +146,7 @@ public class ShellCommandUtil {
}
} else {
LOG.debug(String.format("Not performing chmod %s command for file %s " +
- "because current OS is not Unix-like ", mode, path));
+ "because current OS is not Linux ", mode, path));
}
}
Modified: incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java?rev=1487539&r1=1487538&r2=1487539&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java (original)
+++ incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java Wed May 29 16:40:42 2013
@@ -149,7 +149,7 @@ public class GangliaPropertyProviderTest
Request request = PropertyHelper.getReadRequest(Collections.singleton(PROPERTY_ID), temporalInfoMap);
Assert.assertEquals(3, propertyProvider.populateResources(resources, request, null).size());
- Assert.assertEquals("http://domU-12-31-39-0E-34-E1.compute-1.internal/cgi-bin/rrd.py?c=HDPJobTracker,HDPHBaseMaster,HDPSlaves,HDPNameNode&h=domU-12-31-39-0E-34-E3.compute-1.internal,domU-12-31-39-0E-34-E1.compute-1.internal,domU-12-31-39-0E-34-E2.compute-1.internal&m=jvm.metrics.gcCount&s=10&e=20&r=1",
+ Assert.assertEquals("http://domU-12-31-39-0E-34-E1.compute-1.internal/cgi-bin/rrd.py?c=HDPJobTracker,HDPHBaseMaster,HDPResourceManager,HDPSlaves,HDPHistoryServer,HDPNameNode&h=domU-12-31-39-0E-34-E3.compute-1.internal,domU-12-31-39-0E-34-E1.compute-1.internal,domU-12-31-39-0E-34-E2.compute-1.internal&m=jvm.metrics.gcCount&s=10&e=20&r=1",
streamProvider.getLastSpec());
for (Resource res : resources) {
@@ -186,7 +186,7 @@ public class GangliaPropertyProviderTest
Assert.assertEquals(150, propertyProvider.populateResources(resources, request, null).size());
- Assert.assertEquals("http://domU-12-31-39-0E-34-E1.compute-1.internal/cgi-bin/rrd.py?c=HDPJobTracker,HDPHBaseMaster,HDPSlaves,HDPNameNode&m=jvm.metrics.gcCount&s=10&e=20&r=1",
+ Assert.assertEquals("http://domU-12-31-39-0E-34-E1.compute-1.internal/cgi-bin/rrd.py?c=HDPJobTracker,HDPHBaseMaster,HDPResourceManager,HDPSlaves,HDPHistoryServer,HDPNameNode&m=jvm.metrics.gcCount&s=10&e=20&r=1",
streamProvider.getLastSpec());
}
Modified: incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/security/TestPassFileGeneration.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/security/TestPassFileGeneration.java?rev=1487539&r1=1487538&r2=1487539&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/security/TestPassFileGeneration.java (original)
+++ incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/security/TestPassFileGeneration.java Wed May 29 16:40:42 2013
@@ -123,7 +123,7 @@ public class TestPassFileGeneration exte
assertEquals(pass.length(), passLen);
- if (ShellCommandUtil.UNIX_LIKE) {
+ if (ShellCommandUtil.LINUX) {
String permissions = ShellCommandUtil.
getUnixFilePermissions(passFile.getAbsolutePath());
assertEquals(ShellCommandUtil.MASK_OWNER_ONLY_RW, permissions);
Modified: incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/utils/TestShellCommandUtil.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/utils/TestShellCommandUtil.java?rev=1487539&r1=1487538&r2=1487539&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/utils/TestShellCommandUtil.java (original)
+++ incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/utils/TestShellCommandUtil.java Wed May 29 16:40:42 2013
@@ -80,7 +80,7 @@ public class TestShellCommandUtil extend
public void testUnixFilePermissions() throws Exception {
File dummyFile = new File(temp.getRoot() + File.separator + "dummy");
new FileOutputStream(dummyFile).close();
- if (ShellCommandUtil.UNIX_LIKE) {
+ if (ShellCommandUtil.LINUX) {
ShellCommandUtil.setUnixFilePermissions("600",
dummyFile.getAbsolutePath());
String p = ShellCommandUtil.getUnixFilePermissions(
@@ -103,7 +103,7 @@ public class TestShellCommandUtil extend
// Next command is silently ignored, it's OK
ShellCommandUtil.setUnixFilePermissions(ShellCommandUtil.MASK_OWNER_ONLY_RW,
dummyFile.getAbsolutePath());
- // On Windows, output is always MASK_EVERYBODY_RWX
+ // On Windows/Mac, output is always MASK_EVERYBODY_RWX
String p = ShellCommandUtil.getUnixFilePermissions(
dummyFile.getAbsolutePath());
assertEquals(p, ShellCommandUtil.MASK_EVERYBODY_RWX);
@@ -114,7 +114,7 @@ public class TestShellCommandUtil extend
@Test
public void testRunCommand() throws Exception {
ShellCommandUtil.Result result = null;
- if (ShellCommandUtil.UNIX_LIKE) {
+ if (ShellCommandUtil.LINUX) {
result = ShellCommandUtil.
runCommand(new String [] {"echo", "dummy"});
assertEquals(0, result.getExitCode());
@@ -127,7 +127,7 @@ public class TestShellCommandUtil extend
assertEquals(1, result.getExitCode());
assertFalse(result.isSuccessful());
} else {
- // Skipping this test under Windows
+ // Skipping this test under Windows/Mac
}
}
}