Merge lp:~pete-woods/indicator-network/testing-improvements into lp:indicator-network

[Pete Woods]

Try again to make the tests more reliable

Try again to make the tests more reliable

=== modified file 'src/indicator/menu-builder.cpp'
--- src/indicator/menu-builder.cpp	2016-07-04 17:43:21 +0000
+++ src/indicator/menu-builder.cpp	2016-11-08 16:47:33 +0000
@@ -179,20 +179,6 @@
     d->m_phoneMenu->addSection(d->m_vpnSection);
     d->m_phoneGreeterMenu->addSection(d->m_vpnSection);
 
-    d->m_desktopMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/desktop", d->m_desktopMenu->menu());
-    d->m_desktopGreeterMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/desktop_greeter", d->m_desktopGreeterMenu->menu());
-    d->m_desktopWifiSettingsMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/desktop_wifi_settings", d->m_wifiSection->settingsModel());
-
-    d->m_tabletpMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/tablet", d->m_tabletMenu->menu());
-    d->m_tabletGreeterMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/tablet_greeter", d->m_tabletGreeterMenu->menu());
-    d->m_tabletWifiSettingsMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/tablet_wifi_settings", d->m_wifiSection->settingsModel());
-
-    d->m_phoneMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/phone", d->m_phoneMenu->menu());
-    d->m_phoneGreeterMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/phone_greeter", d->m_phoneGreeterMenu->menu());
-    d->m_phoneWifiSettingsMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/phone_wifi_settings", d->m_wifiSection->settingsModel());
-
-    d->m_ubiquityMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/ubiquity", d->m_ubiquityMenu->menu());
-
     // we have a single actiongroup for all the menus.
     d->m_actionGroupMerger = factory.newActionGroupMerger();
     d->m_actionGroupMerger->add(d->m_flightModeSwitch->actionGroup());
@@ -205,6 +191,20 @@
     d->m_actionGroupExporter = factory.newActionGroupExporter(d->m_actionGroupMerger->actionGroup(),
                                                         "/com/canonical/indicator/network");
 
+    d->m_desktopMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/desktop", d->m_desktopMenu->menu());
+	d->m_desktopGreeterMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/desktop_greeter", d->m_desktopGreeterMenu->menu());
+	d->m_desktopWifiSettingsMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/desktop_wifi_settings", d->m_wifiSection->settingsModel());
+
+	d->m_tabletpMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/tablet", d->m_tabletMenu->menu());
+	d->m_tabletGreeterMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/tablet_greeter", d->m_tabletGreeterMenu->menu());
+	d->m_tabletWifiSettingsMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/tablet_wifi_settings", d->m_wifiSection->settingsModel());
+
+	d->m_phoneMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/phone", d->m_phoneMenu->menu());
+	d->m_phoneGreeterMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/phone_greeter", d->m_phoneGreeterMenu->menu());
+	d->m_phoneWifiSettingsMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/phone_wifi_settings", d->m_wifiSection->settingsModel());
+
+	d->m_ubiquityMenuExporter = factory.newMenuExporter("/com/canonical/indicator/network/ubiquity", d->m_ubiquityMenu->menu());
+
     d->m_busName = factory.newBusName("com.canonical.indicator.network",
                                 [](std::string) {
 #ifdef INDICATOR_NETWORK_TRACE_MESSAGES

=== modified file 'src/indicator/nmofono/nm-device-statistics-monitor.cpp'
--- src/indicator/nmofono/nm-device-statistics-monitor.cpp	2016-10-30 15:13:34 +0000
+++ src/indicator/nmofono/nm-device-statistics-monitor.cpp	2016-11-08 16:47:33 +0000
@@ -82,10 +82,10 @@
         GSettings *settings{nullptr};
         if (qEnvironmentVariableIsSet("INDICATOR_NETWORK_UNDER_TESTING"))
         {
-            Q_ASSERT(qEnvironmentVariableIsSet("INDICATOR_NETWOR_TESTING_GSETTINGS_INI"));
+            Q_ASSERT(qEnvironmentVariableIsSet("INDICATOR_NETWORK_TESTING_GSETTINGS_INI"));
             Q_ASSERT(qEnvironmentVariableIsSet("GSETTINGS_SCHEMA_DIR"));
 
-            GSettingsBackend *backend = g_keyfile_settings_backend_new(qgetenv("INDICATOR_NETWOR_TESTING_GSETTINGS_INI"),
+            GSettingsBackend *backend = g_keyfile_settings_backend_new(qgetenv("INDICATOR_NETWORK_TESTING_GSETTINGS_INI"),
                                                                        "/com/canonical/indicator/network/",
                                                                        "root");
 

=== modified file 'tests/data/networkmanager.py'
--- tests/data/networkmanager.py	2016-10-30 15:13:34 +0000
+++ tests/data/networkmanager.py	2016-11-08 16:47:33 +0000
@@ -591,7 +591,7 @@
     main_connections.append(connection_path)
     settings_obj.Set(SETTINGS_IFACE, 'Connections', main_connections)
 
-    settings_obj.EmitSignal(SETTINGS_IFACE, 'NewConnection', 'o', [ap_path])
+    settings_obj.EmitSignal(SETTINGS_IFACE, 'NewConnection', 'o', [connection_path])
 
     return connection_path
 
@@ -621,6 +621,7 @@
     self.AddObject(active_connection_path,
                    ACTIVE_CONNECTION_IFACE,
                    {
+                       'Id': name,
                        'Devices': device_objects,
                        'Default6': False,
                        'Default': True,

=== modified file 'tests/integration/CMakeLists.txt'
--- tests/integration/CMakeLists.txt	2016-10-30 18:44:54 +0000
+++ tests/integration/CMakeLists.txt	2016-11-08 16:47:33 +0000
@@ -1,5 +1,14 @@
 
-add_definitions(-DNETWORK_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/indicator/indicator-network-service")
+set(INDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR "${CMAKE_BINARY_DIR}/data") #need this somewhere higher up in the hierarchy
+#set(INDICATOR_NETWORK_UNDER_TESTING 1)
+#set(INDICATOR_NETWORK_TESTING_GSETTINGS_INI=${CMAKE_BINARY_DIR}/data/test_gsettings.ini)
+#set(GSETTINGS_SCHEMA_DIR="${INDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR}")
+
+add_definitions(
+    -DNETWORK_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/indicator/indicator-network-service"
+    -DINDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR="${INDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR}"
+    -DINDICATOR_NETWORK_TESTING_GSETTINGS_INI="${CMAKE_BINARY_DIR}/data/test_gsettings.ini"
+)
 
 include_directories(
     "${CMAKE_SOURCE_DIR}/src/connectivity-api/connectivity-qt"
@@ -45,18 +54,6 @@
     integration-tests
 )
 
-set(INDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR ${CMAKE_BINARY_DIR}/data) #need this somewhere higher up in the hierarchy
-
-set(TEST_ENV_VARS
-    INDICATOR_NETWORK_UNDER_TESTING=1
-    INDICATOR_NETWOR_TESTING_GSETTINGS_INI=${CMAKE_BINARY_DIR}/data/test_gsettings.ini
-    GSETTINGS_SCHEMA_DIR=${INDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR}
-)
-set_tests_properties(
-    integration-tests
-    PROPERTIES
-    ENVIRONMENT "${TEST_ENV_VARS}"
-)
 
 add_custom_command(OUTPUT ${INDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR}/gschemas.compiled
                    COMMAND glib-compile-schemas --targetdir=${INDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR} --strict ${CMAKE_SOURCE_DIR}/data

=== modified file 'tests/integration/indicator-network-test-base.cpp'
--- tests/integration/indicator-network-test-base.cpp	2016-10-30 15:13:34 +0000
+++ tests/integration/indicator-network-test-base.cpp	2016-11-08 16:47:33 +0000
@@ -48,14 +48,15 @@
 void IndicatorNetworkTestBase::SetUp()
 {
     qputenv("INDICATOR_NETWORK_SETTINGS_PATH", temporaryDir.path().toUtf8().constData());
+    qputenv("INDICATOR_NETWORK_UNDER_TESTING", "1");
+    qputenv("GSETTINGS_SCHEMA_DIR", INDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR);
+    qputenv("INDICATOR_NETWORK_TESTING_GSETTINGS_INI", INDICATOR_NETWORK_TESTING_GSETTINGS_INI);
 
-    Q_ASSERT(qEnvironmentVariableIsSet("INDICATOR_NETWOR_TESTING_GSETTINGS_INI"));
-    QString inipath = qgetenv("INDICATOR_NETWOR_TESTING_GSETTINGS_INI");
-    if (QFile::exists(inipath))
+    if (QFile::exists(INDICATOR_NETWORK_TESTING_GSETTINGS_INI))
     {
-        QFile::remove(inipath);
+        QFile::remove(INDICATOR_NETWORK_TESTING_GSETTINGS_INI);
     }
-    QFile inifile(inipath);
+    QFile inifile(INDICATOR_NETWORK_TESTING_GSETTINGS_INI);
     inifile.open(QIODevice::WriteOnly | QIODevice::Text);
     QTextStream out(&inifile);
     out << "[root]\ndata-usage-indication=false\n";
@@ -83,7 +84,6 @@
                                 QStringList{"-y", testDir.filePath(QString("%1-%2").arg(test_info->name(), "system.log"))})));
     }
 
-    qDebug() << NETWORK_MANAGER_TEMPLATE_PATH;
     dbusMock.registerTemplate(NM_DBUS_SERVICE, NETWORK_MANAGER_TEMPLATE_PATH, {}, QDBusConnection::SystemBus);
     dbusMock.registerNotificationDaemon();
     // By default the ofono mock starts with one modem
@@ -179,19 +179,15 @@
 
 void IndicatorNetworkTestBase::TearDown()
 {
-    Q_ASSERT(qEnvironmentVariableIsSet("INDICATOR_NETWOR_TESTING_GSETTINGS_INI"));
-    QString inipath = qgetenv("INDICATOR_NETWOR_TESTING_GSETTINGS_INI");
-    if (QFile::exists(inipath))
+    if (QFile::exists(INDICATOR_NETWORK_TESTING_GSETTINGS_INI))
     {
-        QFile::remove(inipath);
+        QFile::remove(INDICATOR_NETWORK_TESTING_GSETTINGS_INI);
     }
 }
 
 void IndicatorNetworkTestBase::setDataUsageIndicationSetting(bool value)
 {
-    Q_ASSERT(qEnvironmentVariableIsSet("INDICATOR_NETWOR_TESTING_GSETTINGS_INI"));
-
-    GSettingsBackend *backend = g_keyfile_settings_backend_new(qgetenv("INDICATOR_NETWOR_TESTING_GSETTINGS_INI"),
+    GSettingsBackend *backend = g_keyfile_settings_backend_new(INDICATOR_NETWORK_TESTING_GSETTINGS_INI,
                                                                "/com/canonical/indicator/network/",
                                                                "root");
     GSettings *settings = g_settings_new_with_backend("com.canonical.indicator.network",

=== modified file 'tests/integration/test-connectivity-api.cpp'
--- tests/integration/test-connectivity-api.cpp	2016-08-03 14:16:10 +0000
+++ tests/integration/test-connectivity-api.cpp	2016-11-08 16:47:33 +0000
@@ -124,50 +124,23 @@
     // Enable flight mode
     connectivity->setFlightMode(true);
 
-    // We should first get the switch disabled change
-    WAIT_FOR_SIGNALS(flightModeSwitchSpy, 1);
-    EXPECT_EQ(flightModeSwitchSpy.first(), QVariantList() << QVariant(false));
-    if (wifiSwitchSpy.size() != 1)
-    {
-        ASSERT_TRUE(wifiSwitchSpy.wait());
-    }
-    ASSERT_EQ(1, wifiSwitchSpy.size());
-    EXPECT_EQ(wifiSwitchSpy.first(), QVariantList() << QVariant(false));
-    if (hotspotSwitchSpy.size() != 1)
-    {
-        ASSERT_TRUE(hotspotSwitchSpy.wait());
-    }
-    ASSERT_EQ(1, hotspotSwitchSpy.size());
+    WAIT_FOR_SIGNALS(hotspotSwitchSpy, 1)
     EXPECT_EQ(hotspotSwitchSpy.first(), QVariantList() << QVariant(false));
 
     // Wait to be notified that flight mode was enabled
-    if (urfkillSpy.size() != 1)
-    {
-        ASSERT_TRUE(urfkillSpy.wait());
-    }
-    ASSERT_EQ(1, urfkillSpy.size());
+    WAIT_FOR_SIGNALS(urfkillSpy, 1)
     EXPECT_EQ(urfkillSpy.first(), QVariantList() << QVariant(true));
 
     // The switch enabled change should complete
-    if (flightModeSwitchSpy.size() != 2)
-    {
-        ASSERT_TRUE(flightModeSwitchSpy.wait());
-    }
-    ASSERT_EQ(2, flightModeSwitchSpy.size());
+    WAIT_FOR_SIGNALS(flightModeSwitchSpy, 2)
+    EXPECT_EQ(flightModeSwitchSpy.first(), QVariantList() << QVariant(false));
     EXPECT_EQ(flightModeSwitchSpy.last(), QVariantList() << QVariant(true));
-    if (wifiSwitchSpy.size() != 2)
-    {
-        ASSERT_TRUE(wifiSwitchSpy.wait());
-    }
-    ASSERT_EQ(2, wifiSwitchSpy.size());
+    WAIT_FOR_SIGNALS(wifiSwitchSpy, 2)
+    EXPECT_EQ(wifiSwitchSpy.first(), QVariantList() << QVariant(false));
     EXPECT_EQ(wifiSwitchSpy.last(), QVariantList() << QVariant(true));
 
     // Wait for flight mode property change
-    if (flightModeSpy.size() != 1)
-    {
-        ASSERT_TRUE(flightModeSpy.wait());
-    }
-    ASSERT_EQ(1, flightModeSpy.size());
+    WAIT_FOR_SIGNALS(flightModeSpy, 1)
     EXPECT_EQ(flightModeSpy.first(), QVariantList() << QVariant(true));
 
     // Check that nothing is happening again
@@ -192,49 +165,23 @@
 
     // We should first get the unstoppable operation change
     ASSERT_TRUE(flightModeSwitchSpy.wait());
-    ASSERT_EQ(1, flightModeSwitchSpy.size());
-    EXPECT_EQ(flightModeSwitchSpy.first(), QVariantList() << QVariant(false));
-    if (wifiSwitchSpy.size() != 1)
-    {
-        ASSERT_TRUE(wifiSwitchSpy.wait());
-    }
-    ASSERT_EQ(1, wifiSwitchSpy.size());
-    EXPECT_EQ(wifiSwitchSpy.first(), QVariantList() << QVariant(false));
 
     // Wait to be notified that flight mode was disabled
-    if (urfkillSpy.size() != 1)
-    {
-        ASSERT_TRUE(urfkillSpy.wait());
-    }
-    ASSERT_EQ(1, urfkillSpy.size());
+    WAIT_FOR_SIGNALS(urfkillSpy, 1)
     EXPECT_EQ(urfkillSpy.first(), QVariantList() << QVariant(false));
 
     // The toggles should become enabled again
-    if (flightModeSwitchSpy.size() != 2)
-    {
-        ASSERT_TRUE(flightModeSwitchSpy.wait());
-    }
-    ASSERT_EQ(2, flightModeSwitchSpy.size());
-    EXPECT_EQ(wifiSwitchSpy.last(), QVariantList() << QVariant(true));
-    if (wifiSwitchSpy.size() != 2)
-    {
-        ASSERT_TRUE(wifiSwitchSpy.wait());
-    }
-    ASSERT_EQ(2, wifiSwitchSpy.size());
-    EXPECT_EQ(wifiSwitchSpy.last(), QVariantList() << QVariant(true));
-    if (hotspotSwitchSpy.size() != 1)
-    {
-        ASSERT_TRUE(hotspotSwitchSpy.wait());
-    }
-    ASSERT_EQ(1, hotspotSwitchSpy.size());
+    WAIT_FOR_SIGNALS(flightModeSwitchSpy, 2)
+    EXPECT_EQ(flightModeSwitchSpy.first(), QVariantList() << QVariant(false));
+    EXPECT_EQ(flightModeSwitchSpy.last(), QVariantList() << QVariant(true));
+    WAIT_FOR_SIGNALS(wifiSwitchSpy, 2)
+    EXPECT_EQ(wifiSwitchSpy.first(), QVariantList() << QVariant(false));
+    EXPECT_EQ(wifiSwitchSpy.last(), QVariantList() << QVariant(true));
+    WAIT_FOR_SIGNALS(hotspotSwitchSpy, 1)
     EXPECT_EQ(hotspotSwitchSpy.first(), QVariantList() << QVariant(true));
 
     // Wait for flight mode property change
-    if (flightModeSpy.size() != 1)
-    {
-        ASSERT_TRUE(flightModeSpy.wait());
-    }
-    ASSERT_EQ(1, flightModeSpy.size());
+    WAIT_FOR_SIGNALS(flightModeSpy, 1)
     EXPECT_EQ(flightModeSpy.first(), QVariantList() << QVariant(false));
 
     // Check that nothing is happening again
@@ -280,50 +227,21 @@
 
     // Check the switch enabled flags change
     ASSERT_TRUE(flightModeSwitchSpy.wait());
-    ASSERT_EQ(1, flightModeSwitchSpy.size());
-    EXPECT_EQ(flightModeSwitchSpy.first(), QVariantList() << QVariant(false));
-
-    if (wifiSwitchSpy.size() != 1)
-    {
-        ASSERT_TRUE(wifiSwitchSpy.wait());
-    }
-    ASSERT_EQ(1, wifiSwitchSpy.size());
-    EXPECT_EQ(wifiSwitchSpy.first(), QVariantList() << QVariant(false));
-
-    if (hotspotSwitchSpy.size() != 1)
-    {
-        ASSERT_TRUE(hotspotSwitchSpy.wait());
-    }
-    ASSERT_EQ(1, hotspotSwitchSpy.size());
-    EXPECT_EQ(hotspotSwitchSpy.first(), QVariantList() << QVariant(false));
 
     // Wait to be notified that wifi was toggled
-    if (urfkillSpy.size() != 1)
-    {
-        ASSERT_TRUE(urfkillSpy.wait());
-    }
-    ASSERT_EQ(1, urfkillSpy.size());
+    WAIT_FOR_SIGNALS(urfkillSpy, 1)
 
     // Switch should be re-enabled now
-    if (flightModeSwitchSpy.size() != 2)
-    {
-        ASSERT_TRUE(flightModeSwitchSpy.wait());
-    }
-    ASSERT_EQ(2, flightModeSwitchSpy.size());
+    WAIT_FOR_SIGNALS(flightModeSwitchSpy, 2)
+    EXPECT_EQ(flightModeSwitchSpy.first(), QVariantList() << QVariant(false));
     EXPECT_EQ(flightModeSwitchSpy.last(), QVariantList() << QVariant(true));
 
-    if (hotspotSwitchSpy.size() != 2)
-    {
-        ASSERT_TRUE(hotspotSwitchSpy.wait());
-    }
-    ASSERT_EQ(2, hotspotSwitchSpy.size());
+    WAIT_FOR_SIGNALS(hotspotSwitchSpy, 2)
+    EXPECT_EQ(hotspotSwitchSpy.first(), QVariantList() << QVariant(false));
     EXPECT_EQ(hotspotSwitchSpy.last(), QVariantList() << QVariant(true));
 
-    if (wifiSwitchSpy.size() != 2)
-    {
-        ASSERT_TRUE(wifiSwitchSpy.wait());
-    }
-    ASSERT_EQ(2, wifiSwitchSpy.size());
+    WAIT_FOR_SIGNALS(wifiSwitchSpy, 2)
+    EXPECT_EQ(wifiSwitchSpy.first(), QVariantList() << QVariant(false));
     EXPECT_EQ(wifiSwitchSpy.last(), QVariantList() << QVariant(true));
 
     // Wait for wifi enabled property change
@@ -355,59 +273,27 @@
 
     // Toggles should be disabled
     ASSERT_TRUE(flightModeSwitchSpy.wait());
-    ASSERT_EQ(1, flightModeSwitchSpy.size());
-    EXPECT_EQ(flightModeSwitchSpy.first(), QVariantList() << QVariant(false));
-
-    if (wifiSwitchSpy.size() != 1)
-    {
-        ASSERT_TRUE(wifiSwitchSpy.wait());
-    }
-    ASSERT_EQ(1, wifiSwitchSpy.size());
-    EXPECT_EQ(wifiSwitchSpy.first(), QVariantList() << QVariant(false));
-
-    if (hotspotSwitchSpy.size() != 1)
-    {
-        ASSERT_TRUE(hotspotSwitchSpy.wait());
-    }
-    ASSERT_EQ(1, hotspotSwitchSpy.size());
-    EXPECT_EQ(hotspotSwitchSpy.first(), QVariantList() << QVariant(false));
 
     // Wait to be notified that wifi was toggled
-    if (urfkillSpy.size() != 1)
-    {
-        ASSERT_TRUE(urfkillSpy.wait());
-    }
-    ASSERT_EQ(1, urfkillSpy.size());
+    WAIT_FOR_SIGNALS(urfkillSpy, 1)
 
     // Toggles should be re-enabled
-    if (flightModeSwitchSpy.size() != 2)
-    {
-        ASSERT_TRUE(flightModeSwitchSpy.wait());
-    }
+    WAIT_FOR_SIGNALS(flightModeSwitchSpy, 2)
     ASSERT_EQ(2, flightModeSwitchSpy.size());
+    EXPECT_EQ(flightModeSwitchSpy.first(), QVariantList() << QVariant(false));
     EXPECT_EQ(wifiSwitchSpy.last(), QVariantList() << QVariant(true));
 
-    if (wifiSwitchSpy.size() != 2)
-    {
-        ASSERT_TRUE(wifiSwitchSpy.wait());
-    }
-    ASSERT_EQ(2, wifiSwitchSpy.size());
+    WAIT_FOR_SIGNALS(wifiSwitchSpy, 2)
+    EXPECT_EQ(wifiSwitchSpy.first(), QVariantList() << QVariant(false));
     EXPECT_EQ(wifiSwitchSpy.last(), QVariantList() << QVariant(true));
 
     // Hotspot should become available again
-    if (hotspotSwitchSpy.size() != 2)
-    {
-        ASSERT_TRUE(hotspotSwitchSpy.wait());
-    }
-    ASSERT_EQ(2, hotspotSwitchSpy.size());
+    WAIT_FOR_SIGNALS(hotspotSwitchSpy, 2)
+    EXPECT_EQ(hotspotSwitchSpy.first(), QVariantList() << QVariant(false));
     EXPECT_EQ(hotspotSwitchSpy.last(), QVariantList() << QVariant(true));
 
     // Wait for wifi enabled property change
-    if (wifiEnabledSpy.size() != 1)
-    {
-        ASSERT_TRUE(wifiEnabledSpy.wait());
-    }
-    ASSERT_EQ(1, wifiEnabledSpy.size());
+    WAIT_FOR_SIGNALS(wifiEnabledSpy, 1)
     EXPECT_EQ(wifiEnabledSpy.first(), QVariantList() << QVariant(true));
 
     // All toggles should be enabled

=== modified file 'tests/integration/test-indicator.cpp'
--- tests/integration/test-indicator.cpp	2016-10-30 15:13:34 +0000
+++ tests/integration/test-indicator.cpp	2016-11-08 16:47:33 +0000
@@ -2214,11 +2214,11 @@
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
                 .section()
+				.mode(mh::MenuItemMatcher::Mode::starts_with)
                 .item(mobileDataSwitch())
                 .item(modemInfo("", "SIM Locked", "simcard-locked", true)
                       .pass_through_activate("x-canonical-modem-locked-action")
                 )
-                .item(cellularSettings())
             )
         ).match());
 
@@ -2307,11 +2307,11 @@
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
                 .section()
+				.mode(mh::MenuItemMatcher::Mode::starts_with)
                 .item(mobileDataSwitch())
                 .item(modemInfo("", "SIM Locked", "simcard-locked", true)
                       .pass_through_activate("x-canonical-modem-locked-action")
                 )
-                .item(cellularSettings())
             )
         ).match());
 
@@ -2364,11 +2364,11 @@
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
                 .section()
+				.mode(mh::MenuItemMatcher::Mode::starts_with)
                 .item(mobileDataSwitch())
                 .item(modemInfo("", "SIM Locked", "simcard-locked", true)
                       .pass_through_activate("x-canonical-modem-locked-action")
                 )
-                .item(cellularSettings())
             )
         ).match());
 
@@ -2432,12 +2432,12 @@
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
                 .section()
+				.mode(mh::MenuItemMatcher::Mode::starts_with)
                 .item(mobileDataSwitch())
                 .item(modemInfo("SIM 1", "SIM Locked", "simcard-locked", true)
                       .pass_through_activate("x-canonical-modem-locked-action")
                 )
                 .item(modemInfo("SIM 2", "SIM Locked", "simcard-locked", true))
-                .item(cellularSettings())
             )
         ).match());
 
@@ -2490,12 +2490,12 @@
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
                 .section()
+				.mode(mh::MenuItemMatcher::Mode::starts_with)
                 .item(mobileDataSwitch())
                 .item(modemInfo("SIM 1", "SIM Locked", "simcard-locked", true))
                 .item(modemInfo("SIM 2", "SIM Locked", "simcard-locked", true)
                       .pass_through_activate("x-canonical-modem-locked-action")
                 )
-                .item(cellularSettings())
             )
         ).match());
 
@@ -2558,11 +2558,11 @@
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
                 .section()
+				.mode(mh::MenuItemMatcher::Mode::starts_with)
                 .item(mobileDataSwitch())
                 .item(modemInfo("", "SIM Locked", "simcard-locked", true)
                       .pass_through_activate("x-canonical-modem-locked-action")
                 )
-                .item(cellularSettings())
             )
         ).match());
 
@@ -2643,11 +2643,11 @@
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
                 .section()
+				.mode(mh::MenuItemMatcher::Mode::starts_with)
                 .item(mobileDataSwitch())
                 .item(modemInfo("", "SIM Locked", "simcard-locked", true)
                       .pass_through_activate("x-canonical-modem-locked-action")
                 )
-                .item(cellularSettings())
             )
         ).match());
 
@@ -2927,12 +2927,12 @@
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
                 .section()
+				.mode(mh::MenuItemMatcher::Mode::starts_with)
                 .item(mobileDataSwitch())
                 .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-full"))
                 .item(modemInfo("SIM 2", "SIM Locked", "simcard-locked", true)
                       .pass_through_activate("x-canonical-modem-locked-action")
                 )
-                .item(cellularSettings())
             )
         ).match());
 
@@ -3213,7 +3213,7 @@
         .item(mh::MenuItemMatcher()
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .submenu()
-              .item(flightModeSwitch())
+              .item(flightModeSwitch(false))
               .item(mh::MenuItemMatcher()
                   .mode(mh::MenuItemMatcher::Mode::starts_with)
                   .section()
@@ -3229,7 +3229,7 @@
         .item(mh::MenuItemMatcher()
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .submenu()
-              .item(flightModeSwitch())
+              .item(flightModeSwitch(true))
               .item(mh::MenuItemMatcher()
                   .mode(mh::MenuItemMatcher::Mode::starts_with)
                   .section()
@@ -3246,7 +3246,7 @@
         .item(mh::MenuItemMatcher()
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .submenu()
-              .item(flightModeSwitch())
+              .item(flightModeSwitch(false))
               .item(mh::MenuItemMatcher()
                   .mode(mh::MenuItemMatcher::Mode::starts_with)
                   .section()
@@ -3348,9 +3348,6 @@
  * Disabled by default because containst sleeps and what not other horrible things.
  * There are timers involved, so this will be flaky
  * To manually run, do following inside ${CMAKE_BINARY_DIR}
- *     $ export INDICATOR_NETWORK_UNDER_TESTING=1
- *     $ export INDICATOR_NETWOR_TESTING_GSETTINGS_INI=./data/test_gsettings.ini
- *     $ export GSETTINGS_SCHEMA_DIR=./data
  *     $ tests/integration/integration-tests --gtest_filter=TestIndicator.DISABLED_DataUsageIndication_enabled --gtest_also_run_disabled_tests
  */
 TEST_F(TestIndicator, DISABLED_DataUsageIndication_enabled)