Monster merge from the integration branch. Still some problems left and JUnits failing.

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng.tests / src / org / eclipse / linuxtools / lttng / control / LTTngSyntheticEventProviderTest.java

diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/control/LTTngSyntheticEventProviderTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/control/LTTngSyntheticEventProviderTest.java
index a2621bbe0568af80c22bc929657b8b80b4772013..861d7923a39280413869f4daa3f450f698b9b9f9 100644 (file)
--- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/control/LTTngSyntheticEventProviderTest.java
+++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/control/LTTngSyntheticEventProviderTest.java
@@ -60,7 +60,7 @@ public class LTTngSyntheticEventProviderTest extends LttngTestPreparation {
                // experiment selected, build experiment selection context and trigger
                // check point creation
                expManager.experimentSelected_prep(experiment);
-               // Action trigger
+               // builds check points in parallel
                expManager.experimentSelected(this, experiment);
 
                // Obtain the singleton event provider
@@ -77,6 +77,7 @@ public class LTTngSyntheticEventProviderTest extends LttngTestPreparation {
                synProvider.sendRequest(request1);
                synProvider.sendRequest(request2);
                try {
+                       request1.waitForCompletion();
                        request2.waitForCompletion();
                } catch (InterruptedException e) {
                        e.printStackTrace();