Merge remote-tracking branch 'origin/2.6'

2 files changed, 11 insertions, 6 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 463cdbfce..0e1904b60 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -89,8 +89,11 @@ owncloud_add_test(OAuth "syncenginetestutils.h")
 
 configure_file(test_journal.db "${PROJECT_BINARY_DIR}/bin/test_journal.db" COPYONLY)
 
-find_package(CMocka)
-if (CMOCKA_FOUND)
-    include(AddCMockaTest)
-    add_subdirectory(csync)
-endif (CMOCKA_FOUND)
+if (NOT WIN32)
+    # the tests still need porting
+    find_package(CMocka)
+    if (CMOCKA_FOUND)
+        include(AddCMockaTest)
+        add_subdirectory(csync)
+    endif (CMOCKA_FOUND)
+endif()
diff --git a/test/testoauth.cpp b/test/testoauth.cpp
index 5d0e64334..a68d71497 100644
--- a/test/testoauth.cpp
+++ b/test/testoauth.cpp
@@ -268,7 +268,9 @@ private slots:
                 ASSERT(browserReply);
                 // simulate the fact that the browser is closing the connection
                 browserReply->abort();
-                QCoreApplication::processEvents();
+                // don't process network events, as it messes up the execution order and
+                // causes an Qt internal crash
+                QCoreApplication::processEvents(QEventLoop::ExcludeSocketNotifiers);
 
                 ASSERT(state == BrowserOpened);
                 state = TokenAsked;