Merge lp:~jonas-drange/ubuntu-system-settings/fix-tst-systemimage into lp:ubuntu-system-settings
- fix-tst-systemimage
- Merge into trunk
| Status: | Merged |
|---|---|
| Approved by: | Jonas G. Drange |
| Approved revision: | 1738 |
| Merged at revision: | 1730 |
| Proposed branch: | lp:~jonas-drange/ubuntu-system-settings/fix-tst-systemimage |
| Merge into: | lp:ubuntu-system-settings |
| Diff against target: |
167 lines (+23/-45) 4 files modified
tests/CMakeLists.txt (+9/-7) tests/autopilot/ubuntu_system_settings/tests/systemimage.py (+2/-14) tests/autopilot/ubuntu_system_settings/tests/test_about.py (+2/-7) tests/tst_systemimage.cpp (+10/-17) |
| To merge this branch: | bzr merge lp:~jonas-drange/ubuntu-system-settings/fix-tst-systemimage |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ken VanDine | Approve | ||
| system-apps-ci-bot | continuous-integration | Needs Fixing | |
|
Review via email:
|
|||
Commit message
* clarifies how we add the system image test via cmake
* simplifies the systemimage template so that it's easier to test detailed version
* cleanups in tst-systemimage now waits for the QSystemImage instance to be destroyed
Description of the change
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
- 1725. By Jonas G. Drange
-
add wait
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1725
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 1726. By Jonas G. Drange
-
attempt to bring SI on the bus by not setting detailed version
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1726
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 1727. By Jonas G. Drange
-
run test without assertion
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1727
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 1728. By Jonas G. Drange
-
let qtdbusmock decide the dbus lib dep
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1728
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 1729. By Jonas G. Drange
-
log a bit
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1729
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1729
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 1730. By Jonas G. Drange
-
less wait
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1730
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 1731. By Jonas G. Drange
-
are we logging anything??
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:1731
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:1731
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1731
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 1732. By Jonas G. Drange
-
only sleep after creating the mock
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1732
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 1733. By Jonas G. Drange
-
reduce wait, rinse, repeat
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:1733
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1733
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 1734. By Jonas G. Drange
-
remove timeouts
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:1734
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:1734
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:1734
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1734
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1734
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 1735. By Jonas G. Drange
-
increase timouet
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1735
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 1736. By Jonas G. Drange
-
it's not failing in init, so wait before moving to test
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1736
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:1736
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1736
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 1737. By Jonas G. Drange
-
act like imagemanager and wait for qsystemimage to have died
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1737
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:1737
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1737
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1737
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:1737
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1737
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:1737
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1737
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:1737
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 1738. By Jonas G. Drange
-
remove comment
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1738
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Ken VanDine (ken-vandine) wrote : | # |
Looks fine and the test failure doesn't look related.
Preview Diff
| 1 | === modified file 'tests/CMakeLists.txt' |
| 2 | --- tests/CMakeLists.txt 2016-09-22 14:21:55 +0000 |
| 3 | +++ tests/CMakeLists.txt 2016-10-07 14:24:32 +0000 |
| 4 | @@ -42,12 +42,6 @@ |
| 5 | ../src/utils.cpp |
| 6 | ) |
| 7 | |
| 8 | -add_executable(tst-systemimage |
| 9 | - tst_systemimage.cpp |
| 10 | - mocks/system-image-dbus/fakesystemimagedbus.cpp |
| 11 | -) |
| 12 | -target_link_libraries(tst-systemimage uss-systemimage) |
| 13 | - |
| 14 | qt5_use_modules(tst-plugins Core Qml Test) |
| 15 | target_link_libraries(tst-plugins SystemSettings ${GLIB_LDFLAGS}) |
| 16 | add_test(tst-plugins tst-plugins) |
| 17 | @@ -59,9 +53,17 @@ |
| 18 | target_link_libraries(tst-arguments ${GLIB_LDFLAGS}) |
| 19 | add_test(tst-arguments tst-arguments) |
| 20 | |
| 21 | +add_executable(tst-systemimage |
| 22 | + tst_systemimage.cpp |
| 23 | + mocks/system-image-dbus/fakesystemimagedbus.cpp |
| 24 | +) |
| 25 | qt5_use_modules(tst-systemimage Core DBus Test) |
| 26 | -target_link_libraries(tst-systemimage ${QTDBUSMOCK_LIBRARIES} ${QTDBUSTEST_LIBRARIES}) |
| 27 | add_test(tst-systemimage tst-systemimage) |
| 28 | +target_link_libraries(tst-systemimage |
| 29 | + uss-systemimage |
| 30 | + ${QTDBUSMOCK_LIBRARIES} |
| 31 | + ${QTDBUSTEST_LIBRARIES} |
| 32 | +) |
| 33 | |
| 34 | configure_file (test_code.py.in test_code.py) |
| 35 | configure_file (test_push_helper.py.in test_push_helper.py) |
| 36 | |
| 37 | === modified file 'tests/autopilot/ubuntu_system_settings/tests/systemimage.py' |
| 38 | --- tests/autopilot/ubuntu_system_settings/tests/systemimage.py 2016-08-01 20:32:38 +0000 |
| 39 | +++ tests/autopilot/ubuntu_system_settings/tests/systemimage.py 2016-10-07 14:24:32 +0000 |
| 40 | @@ -19,21 +19,11 @@ |
| 41 | |
| 42 | |
| 43 | def information(self): |
| 44 | - |
| 45 | - # Build a version_details key=value string |
| 46 | - vd_dict = self.si_props['version_detail'] |
| 47 | - vd_str = '' |
| 48 | - for i, k in enumerate(vd_dict): |
| 49 | - cmma = ',' |
| 50 | - if (i == len(vd_dict) - 1): |
| 51 | - cmma = '' |
| 52 | - vd_str += '%s=%s%s' % (k, str(vd_dict[k]), cmma) |
| 53 | - |
| 54 | return dbus.Dictionary({ |
| 55 | 'target_build_number': str(self.si_props['target_build_number']), |
| 56 | 'device_name': self.si_props['device'], |
| 57 | 'last_check_date': self.si_props['last_check_date'], |
| 58 | - 'version_detail': vd_str, |
| 59 | + 'version_detail': self.si_props['version_detail'], |
| 60 | 'channel_name': self.si_props['channel'], |
| 61 | 'last_update_date': self.si_props['last_update_date'], |
| 62 | 'current_build_number': str(self.si_props['build_number']) |
| 63 | @@ -72,9 +62,7 @@ |
| 64 | 'last_check_date': _parameters.get('last_check_date', ''), |
| 65 | 'target_build_number': _parameters.get('target_build_number', -1), |
| 66 | 'target_version_detail': _parameters.get('target_version_detail', ''), |
| 67 | - 'version_detail': _parameters.get( |
| 68 | - 'version_detail', dbus.Dictionary({}, signature='ss') |
| 69 | - ), |
| 70 | + 'version_detail': _parameters.get('version_detail', ''), |
| 71 | 'update_available': _parameters.get('update_available', False), |
| 72 | 'reply_on_pause': _parameters.get('reply_on_pause', ''), |
| 73 | 'reply_on_cancel': _parameters.get('reply_on_cancel', ''), |
| 74 | |
| 75 | === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_about.py' |
| 76 | --- tests/autopilot/ubuntu_system_settings/tests/test_about.py 2015-10-26 13:03:03 +0000 |
| 77 | +++ tests/autopilot/ubuntu_system_settings/tests/test_about.py 2016-10-07 14:24:32 +0000 |
| 78 | @@ -174,13 +174,8 @@ |
| 79 | |
| 80 | class AboutOtaTestCase(AboutSystemImageBaseTestCase): |
| 81 | systemimage_parameters = { |
| 82 | - 'version_detail': { |
| 83 | - 'ubuntu': '20150123.1', |
| 84 | - 'device': '20153344.1', |
| 85 | - 'custom': '201594834.1', |
| 86 | - 'version': '257', |
| 87 | - 'tag': 'OTA-100' |
| 88 | - } |
| 89 | + 'version_detail': 'ubuntu=20150123.1,device=20153344.1,\ |
| 90 | + custom=201594834.1,version=257,tag=OTA-100' |
| 91 | } |
| 92 | |
| 93 | def test_ota_version(self): |
| 94 | |
| 95 | === modified file 'tests/tst_systemimage.cpp' |
| 96 | --- tests/tst_systemimage.cpp 2016-08-08 12:10:54 +0000 |
| 97 | +++ tests/tst_systemimage.cpp 2016-10-07 14:24:32 +0000 |
| 98 | @@ -27,7 +27,6 @@ |
| 99 | class TstSystemImage: public QObject |
| 100 | { |
| 101 | Q_OBJECT |
| 102 | -public: |
| 103 | private Q_SLOTS: |
| 104 | void init() |
| 105 | { |
| 106 | @@ -37,26 +36,19 @@ |
| 107 | parameters["channel"] = "testchannel"; |
| 108 | parameters["build_number"] = 10; |
| 109 | parameters["target_build_number"] = 42; |
| 110 | - |
| 111 | - QVariantMap versionDetail; |
| 112 | - versionDetail["foo"] = "bar"; |
| 113 | - versionDetail["tag"] = "OTA-100"; |
| 114 | - versionDetail["ubuntu"] = "101"; |
| 115 | - versionDetail["device"] = "102"; |
| 116 | - versionDetail["custom"] = "103"; |
| 117 | - parameters["version_detail"] = versionDetail; |
| 118 | + parameters["version_detail"] = |
| 119 | + "foo=bar,tag=OTA-100,ubuntu=101,device=102,custom=103"; |
| 120 | |
| 121 | m_siMock = new FakeSystemImageDbus(parameters); |
| 122 | m_dbus = new QDBusConnection(m_siMock->dbus()); |
| 123 | - m_systemImage = new QSystemImage(*m_dbus); |
| 124 | m_mock = new QDBusInterface(SI_SERVICE, |
| 125 | SI_MAIN_OBJECT, |
| 126 | "org.freedesktop.DBus.Mock", |
| 127 | *m_dbus); |
| 128 | - |
| 129 | m_methodSpy = new QSignalSpy( |
| 130 | m_mock, SIGNAL(MethodCalled(const QString &, const QVariantList &)) |
| 131 | ); |
| 132 | + m_systemImage = new QSystemImage(*m_dbus); |
| 133 | |
| 134 | /* The following connections help us test DBus signals that are not |
| 135 | mockable. See https://github.com/martinpitt/python-dbusmock/issues/23 |
| 136 | @@ -71,13 +63,14 @@ |
| 137 | ); |
| 138 | connect(m_siMock, SIGNAL(mockSettingChanged(QString, QString)), |
| 139 | m_systemImage, SLOT(settingsChanged(QString, QString))); |
| 140 | - |
| 141 | } |
| 142 | void cleanup() |
| 143 | { |
| 144 | + QSignalSpy destroyedSpy(m_systemImage, SIGNAL(destroyed(QObject*))); |
| 145 | + m_systemImage->deleteLater(); |
| 146 | + QTRY_COMPARE(destroyedSpy.count(), 1); |
| 147 | delete m_methodSpy; |
| 148 | delete m_siMock; |
| 149 | - delete m_systemImage; |
| 150 | } |
| 151 | void testDetailedVersionDetails() |
| 152 | { |
| 153 | @@ -277,10 +270,10 @@ |
| 154 | } |
| 155 | private: |
| 156 | QSignalSpy *m_methodSpy; |
| 157 | - FakeSystemImageDbus *m_siMock; |
| 158 | - QDBusInterface *m_mock; |
| 159 | - QSystemImage *m_systemImage; |
| 160 | - QDBusConnection *m_dbus; |
| 161 | + FakeSystemImageDbus *m_siMock = nullptr; |
| 162 | + QDBusInterface *m_mock = nullptr; |
| 163 | + QSystemImage *m_systemImage = nullptr; |
| 164 | + QDBusConnection *m_dbus = nullptr; |
| 165 | }; |
| 166 | |
| 167 | QTEST_GUILESS_MAIN(TstSystemImage) |
FAILED: Continuous integration, rev:1724
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/