ubuntu-system-settings

Merge lp:~ken-vandine/ubuntu-system-settings/rtm-1390629 into lp:ubuntu-system-settings/rtm-14.09

  1. rtm-1390629
  2. Merge into rtm-14.09
Proposed by Ken VanDine
Status: Rejected
Rejected by: Sebastien Bacher
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/rtm-1390629
Merge into: lp:ubuntu-system-settings/rtm-14.09
Prerequisite: lp:~ken-vandine/ubuntu-system-settings/rtm-upower-0.99
Diff against target: 43 lines (+7/-1)
2 files modified
debian/control (+1/-0)
tests/autopilot/ubuntu_system_settings/tests/__init__.py (+6/-1)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-system-settings/rtm-1390629
Reviewer Review Type Date Requested Status
Jonas G. Drange (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+242126@code.launchpad.net

Commit message

Specify DaemonVersion for upower to support upower 0.99 on vivid

Description of the change

Specify DaemonVersion for upower to support upower 0.99 on vivid

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:941
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/13/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

LGTM

review: Approve
Revision history for this message
Sebastien Bacher (seb128) wrote :

seems like we are not doing more rtm landing, so cleaning the list a bit, that one is rather going to be including with the vivid rebase

Unmerged revisions

941. By Ken VanDine

Specify DaemonVersion for upower to support upower 0.99 on vivid

940. By Ken VanDine

merged upower-0.99 branch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-10-31 14:14:22 +0000
3+++ debian/control 2014-11-18 20:19:34 +0000
4@@ -135,6 +135,7 @@
5 Package: ubuntu-system-settings-autopilot
6 Architecture: all
7 Depends: ubuntu-system-settings,
8+ gir1.2-upowerglib-1.0,
9 python3-autopilot,
10 python3-dbusmock (>= 0.10.1),
11 python3-dateutil,
12
13=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
14--- tests/autopilot/ubuntu_system_settings/tests/__init__.py 2014-10-22 21:34:08 +0000
15+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py 2014-11-18 20:19:34 +0000
16@@ -22,6 +22,7 @@
17 from testtools.matchers import Equals, NotEquals, GreaterThan
18 from time import sleep
19 from ubuntu_system_settings import SystemSettings
20+from gi.repository import UPowerGlib
21
22 ACCOUNTS_IFACE = 'org.freedesktop.Accounts'
23 ACCOUNTS_USER_IFACE = 'org.freedesktop.Accounts.User'
24@@ -43,6 +44,8 @@
25 NM_SERVICE = 'org.freedesktop.NetworkManager'
26 NM_PATH = '/org/freedesktop/NetworkManager'
27 NM_IFACE = 'org.freedesktop.NetworkManager'
28+UPOWER_VERSION = str(UPowerGlib.MAJOR_VERSION)
29+UPOWER_VERSION += '.' + str(UPowerGlib.MINOR_VERSION)
30
31
32 class UbuntuSystemSettingsTestCase(
33@@ -74,7 +77,9 @@
34 cls.dbus_con = cls.get_dbus(True)
35 # Add a mock Upower environment so we get consistent results
36 (cls.p_mock, cls.obj_upower) = cls.spawn_server_template(
37- 'upower', {'OnBattery': True}, stdout=subprocess.PIPE)
38+ 'upower',
39+ {'OnBattery': True, 'DaemonVersion': UPOWER_VERSION},
40+ stdout=subprocess.PIPE)
41 cls.dbusmock = dbus.Interface(cls.obj_upower, dbusmock.MOCK_IFACE)
42
43 def setUp(self, panel=None):

Subscribers

People subscribed via source and target branches