Code review changes

hpcc-systems · Dec 15, 2023 · 840fe8a · 840fe8a
1 parent aedbb6a
commit 840fe8a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/wsclient/src/test/java/org/hpccsystems/ws/client/WSFileIOClientTest.java b/wsclient/src/test/java/org/hpccsystems/ws/client/WSFileIOClientTest.java
@@ -76,6 +76,7 @@ public void copyFile() throws Exception
         client.writeHPCCFileData(data, lzfile, targetLZ, true, 0, 20);
         try
         {
+            System.out.println("Starting file spray.");
             ProgressResponseWrapper dfuspray = wsclient.getFileSprayClient().sprayVariable(
                     new DelimitedDataOptions(),
                     wsclient.getFileSprayClient().fetchLocalDropZones().get(0),
@@ -97,19 +98,20 @@ public void copyFile() throws Exception
             do
             {
                 dfuProgress = wsclient.getFileSprayClient().getDfuProgress(dfuspray.getWuid());
-                if (!whiteListedStates.contains(dfuProgress.getState())) {
+                if (!whiteListedStates.contains(dfuProgress.getState()))
+                {
                     fail("File spray failed: Summary: " + dfuProgress.getSummaryMessage() + " Exceptions: " + dfuProgress.getExceptions());
                 }
 
                 if (dfuProgress.getPercentDone() < 100)
                 {
                     Thread.sleep(1000);
-                    System.out.println("Percent complete: " + dfuProgress.getPercentDone() + " Sleeping for 1sec to wait for spray.");
+                    System.out.println("File spray percent complete: " + dfuProgress.getPercentDone() + "% Sleeping for 1sec to wait for spray.");
                     waitCount++;
                 }
             } while (waitCount < 60 && dfuProgress.getPercentDone() < 100);
 
-            assumeTrue("File spray never completed", waitCount < MAX_WAIT_COUNT);
+            assumeTrue("File spray did not complete within: " + MAX_WAIT_COUNT + "s. Failing test.", waitCount < MAX_WAIT_COUNT);
 
             System.out.println("Test file successfully sprayed to " + "~" + hpccfilename + ", attempting copy to " + hpccfilename + "_2");
             wsclient.getFileSprayClient().copyFile(hpccfilename,hpccfilename + "_2",true);