Merge lp:~laney/ubuntu-system-settings/fix-tests into lp:ubuntu-system-settings

[Iain Lane]

Fix click package update checking and update available/not available signal emission.

Enable and fix the tests.

I'm not sure what I've done is correct, particularly r679. Please review.

Also I haven't checked it actually does fix the click updating bug yet, will do that shortly.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:681
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/801/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/210
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4794
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/317
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/305
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/304
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4375
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4375/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5961
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4926
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4926/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/801/rebuild

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

looks good to me and fixes the click updates not being listed (bug #1306569)

review: Approve

[lp:~laney/ubuntu-system-settings/fix-tests]

682. By Iain Lane on 2014-04-11

IGNORE_UPDATES needs to be set to "IGNORE_UPDATES" to be effective

[Diego Sarmentero (diegosarmentero)]

Thanks for the branch... Just a single question:
Why this change?:
31 m_systemCheckingUpdate = false;
32 - if (!m_apps.contains(packageName)) {
33 + if (!m_apps.contains(packageName) && update->updateRequired()) {
34 m_apps[packageName] = update;
35 m_model.insert(0, QVariant::fromValue(update));
36 Q_EMIT modelChanged();
37 }
38 - Q_EMIT updateAvailableFound(update->updateState());
39 + if (update->updateRequired())
40 + Q_EMIT updateAvailableFound(update->updateState());
41 + else
42 + Q_EMIT updatesNotFound();
43 +
44 reportCheckState();
45 }

As i can see, that function is only being called when this happen:
QObject::connect(&m_systemUpdate, SIGNAL(updateAvailable(const QString&, Update*)),
                  this, SLOT(registerSystemUpdate(const QString&, Update*)));

and system_update.cpp is already checking if the update is required and emitting the proper signal:
    if (update->updateRequired()) {
        Q_EMIT updateAvailable(packageName, update);
    } else {
        Q_EMIT updateNotFound();
    }

So, it only should go throw that function when the update is required.

review: Needs Information

[Iain Lane (laney)]

If you revert it you'll see that the tests start to fail. One of them tests that nothing is put into the model and there's also a test that these signals emitted, which wasn't happening.

It's the one I wasn't sure about though, so if you've a better fix then we can do that.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:682
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/803/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/215
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4799
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/319
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/307
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/306
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4380
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4380/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5966
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4145
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4931
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4931/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/803/rebuild

review: Needs Fixing (continuous-integration)

[lp:~laney/ubuntu-system-settings/fix-tests]

683. By Iain Lane on 2014-04-11

merge lp:~diegosarmentero/ubuntu-system-settings/fix-update-not-required-test

[Diego Sarmentero (diegosarmentero)]

+1
Thanks for the branch

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:683
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/804/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/217
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4801
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/320
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/308
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/307
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4382
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4382/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5970
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4933
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4933/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/804/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/rules'
--- debian/rules	2014-03-10 12:34:30 +0000
+++ debian/rules	2014-04-11 16:32:04 +0000
@@ -21,6 +21,3 @@
 
 %:
 	dh $@ --fail-missing --with python2,migrations
-
-override_dh_auto_test:
-	python tests/test_code.py

=== modified file 'plugins/system-update/update.cpp'
--- plugins/system-update/update.cpp	2014-03-19 19:04:50 +0000
+++ plugins/system-update/update.cpp	2014-04-11 16:32:04 +0000
@@ -61,7 +61,7 @@
 void Update::setRemoteVersion(QString& version)
 {
     m_remote_version = version;
-    if (getIgnoreUpdates()) {
+    if (!getIgnoreUpdates()) {
         int result = debVS.CmpVersion(m_local_version.toUtf8().data(),
                                       m_remote_version.toUtf8().data());
 

=== modified file 'plugins/system-update/update_manager.cpp'
--- plugins/system-update/update_manager.cpp	2014-03-27 13:13:43 +0000
+++ plugins/system-update/update_manager.cpp	2014-04-11 16:32:04 +0000
@@ -201,6 +201,7 @@
         Q_EMIT modelChanged();
     }
     Q_EMIT updateAvailableFound(update->updateState());
+
     reportCheckState();
 }
 

=== modified file 'plugins/system-update/update_manager.h'
--- plugins/system-update/update_manager.h	2014-03-17 02:08:47 +0000
+++ plugins/system-update/update_manager.h	2014-04-11 16:32:04 +0000
@@ -89,14 +89,15 @@
     int get_downloadMode() { return m_downloadMode; }
     void set_token(Token& t) { m_token = t; }
     Token get_token() { return m_token; }
+    void setCheckintUpdates(int value) { m_checkingUpdates = value; }
 #endif
 
 public Q_SLOTS:
     void registerSystemUpdate(const QString& packageName, Update *update);
+    void systemUpdateNotAvailable();
 
 private Q_SLOTS:
     void clickUpdateNotAvailable();
-    void systemUpdateNotAvailable();
     void systemUpdatePaused(int value);
     void processOutput();
     void processUpdates();

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-03-06 18:39:42 +0000
+++ tests/CMakeLists.txt	2014-04-11 16:32:04 +0000
@@ -39,5 +39,6 @@
                       INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR};${CMAKE_SOURCE_DIR}/wizard")
 qt5_use_modules(tst-pagelist Core Test)
 add_test(tst-pagelist tst-pagelist)
+add_test(NAME python COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/test_code.py")
 
 add_subdirectory(plugins)

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_system_updates.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_system_updates.py	2014-03-27 13:16:09 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_system_updates.py	2014-04-11 16:32:04 +0000
@@ -26,7 +26,7 @@
     def setUp(self):
         # Set environment variables
         os.environ["IGNORE_CREDENTIALS"] = "True"
-        os.environ["IGNORE_UPDATES"] = "True"
+        os.environ["IGNORE_UPDATES"] = "IGNORE_UPDATES"
         super(SystemUpdatesTestCases, self).setUp()
 
     def test_show_updates(self):

=== modified file 'tests/plugins/system-update/tst_updatemanager.cpp'
--- tests/plugins/system-update/tst_updatemanager.cpp	2014-03-13 14:28:45 +0000
+++ tests/plugins/system-update/tst_updatemanager.cpp	2014-04-11 16:32:04 +0000
@@ -82,6 +82,7 @@
 void UpdateManagerTest::testRegisterSystemUpdateNotRequired()
 {
     UpdateManager manager;
+    manager.setCheckintUpdates(1);
     QSignalSpy spy(&manager, SIGNAL(modelChanged()));
     QSignalSpy spy2(&manager, SIGNAL(updateAvailableFound(bool)));
     QSignalSpy spy3(&manager, SIGNAL(updatesNotFound()));
@@ -90,17 +91,12 @@
     QTRY_COMPARE(spy3.count(), 0);
     QTRY_COMPARE(manager.get_apps().size(), 0);
 
-    Update *update = getUpdate();
-    update->setUpdateAvailable(false);
-
-    manager.registerSystemUpdate(update->getPackageName(), update);
+    manager.systemUpdateNotAvailable();
     QTRY_COMPARE(spy.count(), 0);
     QTRY_COMPARE(spy2.count(), 0);
     QTRY_COMPARE(spy3.count(), 1);
     QTRY_COMPARE(manager.get_apps().size(), 0);
     QTRY_COMPARE(manager.get_model().size(), 0);
-
-    update->deleteLater();
 }
 
 void UpdateManagerTest::testStartDownload()
@@ -139,7 +135,7 @@
 void UpdateManagerTest::testCheckUpdatesUpdateSignal()
 {
     UpdateManager manager;
-    QSignalSpy spy(&manager, SIGNAL(updateAvailableFound()));
+    QSignalSpy spy(&manager, SIGNAL(updateAvailableFound(bool)));
     QTRY_COMPARE(manager.get_apps().size(), 0);
     manager.checkUpdates();
     QTRY_COMPARE(manager.get_apps().size(), 4);