Merge lp:~pete-woods/indicator-network/tests-not-run-lp1612619 into lp:indicator-network

[Pete Woods]

Re-enable tests on all architectures

Re-enable tests on all architectures

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-06-20 11:06:20 +0000
+++ CMakeLists.txt	2016-08-17 11:48:25 +0000
@@ -113,6 +113,7 @@
 add_subdirectory(po)
 add_subdirectory(doc)
 
+if(ENABLE_TESTS)
 enable_testing()
 add_subdirectory(tests)
 
@@ -138,6 +139,13 @@
     ${CMAKE_BINARY_DIR}/*
 )
 
+else()
+
+# The autopilot tests need this fixture
+add_subdirectory(tests/data)
+
+endif()
+
 endif()
 
 add_subdirectory(scripts)
 
=== modified file 'debian/rules'
--- debian/rules	2015-12-16 11:48:00 +0000
+++ debian/rules	2016-08-17 11:48:25 +0000
@@ -7,13 +7,17 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
+ifneq (,$(filter $(DEB_HOST_ARCH),arm64 s390x powerpc))
+        ENABLE_TESTS = OFF
+else
+        ENABLE_TESTS = ON
+endif
+
 %:
 	dh $@ --parallel --fail-missing --with python3
 
-ifneq (,filter(s390x ,$(DEB_HOST_ARCH)))
-override_dh_auto_test:
-	dh_auto_test || true
-endif
+override_dh_auto_configure:
+	dh_auto_configure -- -DENABLE_TESTS=${ENABLE_TESTS}
 
 override_dh_install:
 	cd tests/autopilot; \
 
=== modified file 'tests/integration/test-indicator.cpp'
--- tests/integration/test-indicator.cpp	2016-07-15 11:25:21 +0000
+++ tests/integration/test-indicator.cpp	2016-08-17 11:48:25 +0000
@@ -3193,12 +3193,21 @@
 
     ASSERT_NO_THROW(startIndicator());
 
+
+    auto modems = con->modems();
+    QSignalSpy rowsInsertedSpy(modems, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
+    if (modems->rowCount() == 0) {
+        ASSERT_TRUE(rowsInsertedSpy.wait());
+    }
+
+    ASSERT_EQ(1, modems->rowCount());
+
     // Check that the indicator switch is enabled when we are not in flightmode
     // and there is a SIM for mobile data set.
 
     con->setMobileDataEnabled(true);
     con->setFlightMode(false);
-    con->setSimForMobileData(getModemSim(*con->modems(), 0));
+    con->setSimForMobileData(getModemSim(*modems, 0));
 
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
@@ -3254,11 +3263,19 @@
 
     ASSERT_NO_THROW(startIndicator());
 
+    auto modems = con->modems();
+    QSignalSpy rowsInsertedSpy(modems, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
+    if (modems->rowCount() == 0) {
+        ASSERT_TRUE(rowsInsertedSpy.wait());
+    }
+
+    ASSERT_EQ(1, modems->rowCount());
+
     // Check that Connectivity::mobileDataEnabled follows the indicator switch
 
     con->setMobileDataEnabled(true);
     con->setFlightMode(false);
-    con->setSimForMobileData(getModemSim(*con->modems(), 0));
+    con->setSimForMobileData(getModemSim(*modems, 0));
     QTest::qWait(250);
     QSignalSpy spy(con.get(), SIGNAL(mobileDataEnabledUpdated(bool)));