bug fix

Author: e-strauss

src/test/java/org/apache/sysds/test/component/misc/DMLScriptTest.java

@@ -284,34 +284,52 @@ public void executeDMLWithScriptShadowBufferWarnTest() throws IOException {
     public void executeDMLWithScriptAndInfoTest() throws IOException {
         String cl = "systemds -s \"print('hello')\"";
         String[] args = cl.split(" ");
-
         Logger.getLogger(DMLScript.class).setLevel(Level.INFO);
         final LoggingUtils.TestAppender appender = LoggingUtils.overwrite();
-        try{
+        try {
             Assert.assertTrue(executeScript(args));
             final List<LoggingEvent> log = LoggingUtils.reinsert(appender);
-            Assert.assertTrue(log.get(1).getMessage().toString().startsWith("BEGIN DML run"));
-            Assert.assertTrue(log.get(2).getMessage().toString().startsWith("Process id"));
+            try {
+                int i = log.get(0).getMessage().toString().startsWith("Low memory budget") ? 1 : 0;
+                Assert.assertTrue(log.get(i++).getMessage().toString().startsWith("BEGIN DML run"));
+                Assert.assertTrue(log.get(i).getMessage().toString().startsWith("Process id"));
+            } catch (Error e) {
+                System.out.println("ERROR while evaluating INFO logs: ");
+                for (LoggingEvent loggingEvent : log) {
+                    System.out.println(loggingEvent.getMessage());
+                }
+                throw e;
+            }
+
         } finally {
             LoggingUtils.reinsert(appender);
         }
     }
 
     @Test
     public void executeDMLWithScriptAndDebugTest() throws IOException {
+        // have to run sequentially, to avoid concurrent call to Logger.getLogger(DMLScript.class)
         String cl = "systemds -s \"print('hello')\"";
         String[] args = cl.split(" ");
 
         Logger.getLogger(DMLScript.class).setLevel(Level.DEBUG);
-        final LoggingUtils.TestAppender appender = LoggingUtils.overwrite();
+        final LoggingUtils.TestAppender appender2 = LoggingUtils.overwrite();
         try{
             Assert.assertTrue(executeScript(args));
-            final List<LoggingEvent> log = LoggingUtils.reinsert(appender);
-            Assert.assertTrue(log.get(2).getMessage().toString().startsWith("BEGIN DML run"));
-            Assert.assertTrue(log.get(3).getMessage().toString().startsWith("DML script"));
-            Assert.assertTrue(log.get(4).getMessage().toString().startsWith("Process id"));
+            final List<LoggingEvent> log = LoggingUtils.reinsert(appender2);
+            try {
+                int i = log.get(0).getMessage().toString().startsWith("Low memory budget") ? 2 : 1;
+                Assert.assertTrue(log.get(i++).getMessage().toString().startsWith("BEGIN DML run"));
+                Assert.assertTrue(log.get(i++).getMessage().toString().startsWith("DML script"));
+                Assert.assertTrue(log.get(i).getMessage().toString().startsWith("Process id"));
+            } catch (Error e){
+                for (LoggingEvent loggingEvent : log) {
+                    System.out.println(loggingEvent.getMessage());
+                }
+                throw e;
+            }
         } finally {
-            LoggingUtils.reinsert(appender);
+            LoggingUtils.reinsert(appender2);
         }
     }
 }