← Back to branch summary

~ci-train-bot/indicator-network/indicator-network-ubuntu-zesty-2073

« back to all changes in this revision

Viewing changes to tests/integration/indicator-network-test-base.cpp

  • Committer: Bileto Bot
  • Author(s): Pete Woods
  • Date: 2016-11-09 10:03:46 UTC
  • mfrom: (641.1.6 stable)
  • Revision ID: ci-train-bot@canonical.com-20161109100346-plycppqa6csz7okp
Try again to make the tests more reliable (LP: #1632275)

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/integration/indicator-network-test-base.cpp
48
48
void IndicatorNetworkTestBase::SetUp()
49
49
{
50
50
    qputenv("INDICATOR_NETWORK_SETTINGS_PATH", temporaryDir.path().toUtf8().constData());
 
51
    qputenv("INDICATOR_NETWORK_UNDER_TESTING", "1");
 
52
    qputenv("GSETTINGS_SCHEMA_DIR", INDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR);
 
53
    qputenv("INDICATOR_NETWORK_TESTING_GSETTINGS_INI", INDICATOR_NETWORK_TESTING_GSETTINGS_INI);
51
54
 
52
 
    Q_ASSERT(qEnvironmentVariableIsSet("INDICATOR_NETWOR_TESTING_GSETTINGS_INI"));
53
 
    QString inipath = qgetenv("INDICATOR_NETWOR_TESTING_GSETTINGS_INI");
54
 
    if (QFile::exists(inipath))
 
55
    if (QFile::exists(INDICATOR_NETWORK_TESTING_GSETTINGS_INI))
55
56
    {
56
 
        QFile::remove(inipath);
 
57
        QFile::remove(INDICATOR_NETWORK_TESTING_GSETTINGS_INI);
57
58
    }
58
 
    QFile inifile(inipath);
 
59
    QFile inifile(INDICATOR_NETWORK_TESTING_GSETTINGS_INI);
59
60
    inifile.open(QIODevice::WriteOnly | QIODevice::Text);
60
61
    QTextStream out(&inifile);
61
62
    out << "[root]\ndata-usage-indication=false\n";
83
84
                                QStringList{"-y", testDir.filePath(QString("%1-%2").arg(test_info->name(), "system.log"))})));
84
85
    }
85
86
 
86
 
    qDebug() << NETWORK_MANAGER_TEMPLATE_PATH;
87
87
    dbusMock.registerTemplate(NM_DBUS_SERVICE, NETWORK_MANAGER_TEMPLATE_PATH, {}, QDBusConnection::SystemBus);
88
88
    dbusMock.registerNotificationDaemon();
89
89
    // By default the ofono mock starts with one modem
179
179
 
180
180
void IndicatorNetworkTestBase::TearDown()
181
181
{
182
 
    Q_ASSERT(qEnvironmentVariableIsSet("INDICATOR_NETWOR_TESTING_GSETTINGS_INI"));
183
 
    QString inipath = qgetenv("INDICATOR_NETWOR_TESTING_GSETTINGS_INI");
184
 
    if (QFile::exists(inipath))
 
182
    if (QFile::exists(INDICATOR_NETWORK_TESTING_GSETTINGS_INI))
185
183
    {
186
 
        QFile::remove(inipath);
 
184
        QFile::remove(INDICATOR_NETWORK_TESTING_GSETTINGS_INI);
187
185
    }
188
186
}
189
187
 
190
188
void IndicatorNetworkTestBase::setDataUsageIndicationSetting(bool value)
191
189
{
192
 
    Q_ASSERT(qEnvironmentVariableIsSet("INDICATOR_NETWOR_TESTING_GSETTINGS_INI"));
193
 
 
194
 
    GSettingsBackend *backend = g_keyfile_settings_backend_new(qgetenv("INDICATOR_NETWOR_TESTING_GSETTINGS_INI"),
 
190
    GSettingsBackend *backend = g_keyfile_settings_backend_new(INDICATOR_NETWORK_TESTING_GSETTINGS_INI,
195
191
                                                               "/com/canonical/indicator/network/",
196
192
                                                               "root");
197
193
    GSettings *settings = g_settings_new_with_backend("com.canonical.indicator.network",