Connector/MXJ commit: r116 - in trunk/connector-mxj: . src/com/mysql/management/util

[eherman]

Modified:
   trunk/connector-mxj/CHANGES
   trunk/connector-mxj/src/com/mysql/management/util/ShellTest.java
Log:
added robustness in tests for differences in 'java' return codes

Modified: trunk/connector-mxj/CHANGES
===================================================================
--- trunk/connector-mxj/CHANGES	2008-02-20 11:15:14 UTC (rev 115)
+++ trunk/connector-mxj/CHANGES	2008-02-20 13:35:10 UTC (rev 116)
@@ -5,6 +5,7 @@
 
 2008-02-19 - added robustness in tests for differences in C/J
            - set the kill-delay for tests to default to 5 seconds
+	   - added robustness in tests for differences in 'java' return codes
 
 2008-02-18 - remove the out-of-date build targets for docs
            - updated build.xml to reflect 5.0.9 release, some code tidy

Modified: trunk/connector-mxj/src/com/mysql/management/util/ShellTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/ShellTest.java	2008-02-20 11:15:14 UTC (rev 115)
+++ trunk/connector-mxj/src/com/mysql/management/util/ShellTest.java	2008-02-20 13:35:10 UTC (rev 116)
@@ -97,7 +97,11 @@
         shell.setWorkingDir(new Files().testDir());
         shell.run();
         assertTrue(shell.hasReturned());
-        assertEquals(1, shell.returnCode());
+        int rv = shell.returnCode();
+        // this is _not_ a prefect test.
+        // With some JVMs we get 1 others we get 0.
+        // however if the "java" command is missing we get 127 on most unix
+        assertEquals("" + rv, true, rv == 1 || rv == 0);
     }
 
     public void testDoubleRun() {