lttng: Fix a test on Windows with file not being able to be deleted

The synthetic trace was being regenerated while it was already opened.
So it was being used in a "nested way" in the test. The test was just
trying to reopen the trace using the path so pass the path instead which
does not try to delete/regenerate the trace.

Change-Id: If510d366f08a9f8895e667efe370bf9c70edcc5e
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/93033
Reviewed-by: Hudson CI
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>

diff --git a/ctf/org.eclipse.tracecompass.ctf.core.tests/shared/org/eclipse/tracecompass/ctf/core/tests/shared/LttngTraceGenerator.java b/ctf/org.eclipse.tracecompass.ctf.core.tests/shared/org/eclipse/tracecompass/ctf/core/tests/shared/LttngTraceGenerator.java
index a9537874378e57f3f10e6d9fb3978693fa22ed13..b5a9962b65da1f70b49651b1864a121362d6ebea 100644 (file)
--- a/ctf/org.eclipse.tracecompass.ctf.core.tests/shared/org/eclipse/tracecompass/ctf/core/tests/shared/LttngTraceGenerator.java
+++ b/ctf/org.eclipse.tracecompass.ctf.core.tests/shared/org/eclipse/tracecompass/ctf/core/tests/shared/LttngTraceGenerator.java
@@ -392,6 +392,10 @@ public class LttngTraceGenerator {
 
                 @Override
                 public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                    // If a file failed to delete, it's more useful to throw this instead
+                    if (exc != null) {
+                        throw exc;
+                    }
                     Files.delete(dir);
                     return FileVisitResult.CONTINUE;
                 }

diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ImportAndReadKernelSmokeTest.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ImportAndReadKernelSmokeTest.java
index 742bb1beb38e8bc8a793991fa2c7de7286f077b0..6954077e825c3f1653cd60efe7d26d0f16453d9d 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ImportAndReadKernelSmokeTest.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ImportAndReadKernelSmokeTest.java
@@ -110,7 +110,7 @@ public class ImportAndReadKernelSmokeTest extends KernelTestBase {
             testHV(getViewPart("Histogram"));
             testCFV((ControlFlowView) getViewPart("Control Flow"));
             testRV((ResourcesView) getViewPart("Resources"));
-            testStateSystemExplorer();
+            testStateSystemExplorer(trace.getPath());
         } finally {
             trace.dispose();
         }
@@ -189,7 +189,7 @@ public class ImportAndReadKernelSmokeTest extends KernelTestBase {
         return vps[0];
     }
 
-    private void testStateSystemExplorer() {
+    private static void testStateSystemExplorer(String tracePath) {
         // Set up
         SWTWorkbenchBot bot = new SWTWorkbenchBot();
         // Open the view
@@ -210,7 +210,7 @@ public class ImportAndReadKernelSmokeTest extends KernelTestBase {
         bot.closeAllEditors();
         bot.waitUntil(treeHasRows(sseBot.bot().tree(), 0));
         // re-open the trace
-        before();
+        SWTBotUtils.openTrace(TRACE_PROJECT_NAME, tracePath, KERNEL_TRACE_TYPE);
         secondOpen = getSSNames(sseBot);
         assertEquals("Test reopen trace", actual, secondOpen);
         sseBot.close();