[jboss-cvs] JBoss Messaging SVN: r5600 - in trunk/tests/src/org/jboss/messaging/tests/integration/paging: remote and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2009-01-08 10:34:11 -0500 (Thu, 08 Jan 2009)
New Revision: 5600

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/paging/remote/RemotePageCrashExecution.java
Log:
Fixing race on test

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java	2009-01-08 14:56:40 UTC (rev 5599)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java	2009-01-08 15:34:11 UTC (rev 5600)
@@ -63,7 +63,7 @@
 
       Process process = SpawnedVMSupport.spawnVM(RemotePageCrashExecution.class.getCanonicalName());
       process.waitFor();
-      assertEquals(1, process.exitValue());
+      assertEquals("The remote process failed, test is invalid", RemotePageCrashExecution.OK, process.exitValue());
 
       File pageDir = new File(getPageDir());
 

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/paging/remote/RemotePageCrashExecution.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/paging/remote/RemotePageCrashExecution.java	2009-01-08 14:56:40 UTC (rev 5599)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/paging/remote/RemotePageCrashExecution.java	2009-01-08 15:34:11 UTC (rev 5600)
@@ -75,12 +75,16 @@
 
    // Constants -----------------------------------------------------
 
+   public static final SimpleString ADDRESS = new SimpleString("SimpleAddress");
+
+   public static final int OK = 123;
+
+   public static final int NOT_OK = 255;
+   
    // Attributes ----------------------------------------------------
 
    // Static --------------------------------------------------------
 
-   public static final SimpleString ADDRESS = new SimpleString("SimpleAddress");
-
    private static final Logger log = Logger.getLogger(RemotePageCrashExecution.class);
 
    public static void main(final String arg[])
@@ -89,10 +93,12 @@
       {
          RemotePageCrashExecution execution = new RemotePageCrashExecution();
          execution.pageAndFail();
+         System.exit(OK);
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          log.warn(e.getMessage(), e);
+         System.exit(NOT_OK);
       }
 
    }
@@ -343,10 +349,7 @@
           */
          public void delete() throws Exception
          {
-            // We want the system to fail
-            System.out.println("Crash");
-            System.out.flush(); // System.exit may not let the System.out to be seen if flush is not called
-            System.exit(1);
+            // This will let the file stay, simulating a system failure
          }
 
          /**