Author: sgoeschl
Date: Fri Jan 8 23:36:41 2016
New Revision: 1723816
URL: http://svn.apache.org/viewvc?rev=1723816&view=rev
Log:
[EXEC-65] Fix faulty OS check which skips the test on Linux
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java?rev=1723816&r1=1723815&r2=1723816&view=diff
==============================================================================
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Fri Jan 8 23:36:41 2016
@@ -38,7 +38,7 @@ public class Exec65Test extends Abstract
@Test(expected = ExecuteException.class, timeout = TEST_TIMEOUT)
public void testExec65WitSleepUsingSleepCommandDirectly() throws Exception
{
- if (OS.isFamilyUnix() && OS.isFamilyMac()) {
+ if (OS.isFamilyUnix()) {
final ExecuteWatchdog watchdog = new
ExecuteWatchdog(WATCHDOG_TIMEOUT);
final DefaultExecutor executor = new DefaultExecutor();
final CommandLine command = new CommandLine("sleep");
@@ -103,7 +103,7 @@ public class Exec65Test extends Abstract
@Test(expected = ExecuteException.class, timeout = TEST_TIMEOUT)
public void testExec65WithSudoUsingShellScript() throws Exception {
- if (OS.isFamilyUnix() && OS.isFamilyMac()) {
+ if (OS.isFamilyUnix()) {
final DefaultExecutor executor = new DefaultExecutor();
executor.setStreamHandler(new PumpStreamHandler(System.out,
System.err, System.in));
executor.setWatchdog(new ExecuteWatchdog(WATCHDOG_TIMEOUT));