Merge pull request #61 in MT/custusx from...

Merge pull request #61 in MT/custusx from bugfix/CX-109-fix-test-failing-on-osx-videoconnectionwidget to develop

* commit '253ef9ab':
  CX-109: Moved test to integration: VideoConnectionWidget can stream
  CX-109: Increase wait for missing signal to 30 sec
  CX-109: Run test as integration test to get more output: VideoConnectionWidget can stream
  Enabled failing test again on OSX to debug

source/plugins/org.custusx.core.video/testing/cxtestCatchStreamingWidgets.cpp

@@ -52,8 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 namespace cxtest
 {
 
-//TODO: Disabled this test temporarily for OSX
-TEST_CASE("VideoConnectionWidget can stream", "[unit][gui][not_win32][widget][streaming][not_apple]")
+TEST_CASE("VideoConnectionWidget can stream", "[gui][not_win32][widget][streaming][integration]")
 {
 	cx::DataLocations::setTestMode();
 	cx::LogicManager::initialize();

source/plugins/org.custusx.core.video/testing/cxtestTestVideoConnectionWidget.cpp

@@ -66,7 +66,7 @@ bool TestVideoConnectionWidget::canStream(QString filename)
 	QTest::mouseClick(mConnectButton, Qt::LeftButton); //connect
 
 	REQUIRE(waitForQueuedSignal(mServices->video().get(), SIGNAL(connected(bool)), 1000));
-	REQUIRE(waitForQueuedSignal(mServices->video().get(), SIGNAL(activeVideoSourceChanged()), 2000));
+	REQUIRE(waitForQueuedSignal(mServices->video().get(), SIGNAL(activeVideoSourceChanged()), 30000));
 	cx::VideoSourcePtr stream = mServices->video()->getActiveVideoSource();
 	REQUIRE(waitForQueuedSignal(stream.get(), SIGNAL(newFrame()), 1000));
 	bool canStream = stream->isStreaming();