Merge lp:~brendan-donegan/ubuntu-autopilot-tests/contacts_dbus_minor_fixes into lp:ubuntu-autopilot-tests/ubuntu-experience-tests

Proposed by Brendan Donegan
Status: Merged
Approved by: Leo Arias
Approved revision: 23
Merged at revision: 23
Proposed branch: lp:~brendan-donegan/ubuntu-autopilot-tests/contacts_dbus_minor_fixes
Merge into: lp:ubuntu-autopilot-tests/ubuntu-experience-tests
Diff against target: 27 lines (+3/-1)
1 file modified
ubuntu_experience_tests/helpers.py (+3/-1)
To merge this branch: bzr merge lp:~brendan-donegan/ubuntu-autopilot-tests/contacts_dbus_minor_fixes
Reviewer Review Type Date Requested Status
Leo Arias (community) Approve
Chris Gagnon (community) Approve
Review via email: mp+223735@code.launchpad.net

Description of the change

Fix a couple of minor issues that slipped in with the ContactsDbusService branch.

To post a comment you must log in.
Revision history for this message
Chris Gagnon (chris.gagnon) wrote :

lgtm

review: Approve
Revision history for this message
Leo Arias (elopio) wrote :

It still doesn't pass flake8:
$ flake8 ../ubuntu_experience_tests/helpers.py:99:1: E302 expected 2 blank lines, found 1

review: Needs Fixing
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

There we go

Revision history for this message
Leo Arias (elopio) wrote :

Thank you!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ubuntu_experience_tests/helpers.py'
--- ubuntu_experience_tests/helpers.py 2014-06-19 09:50:30 +0000
+++ ubuntu_experience_tests/helpers.py 2014-06-19 17:47:00 +0000
@@ -21,6 +21,7 @@
21"""Helper functions to make writing Inter-app integration tests easier."""21"""Helper functions to make writing Inter-app integration tests easier."""
2222
23import dbus23import dbus
24import re
24import subprocess25import subprocess
25import time26import time
2627
@@ -32,7 +33,7 @@
32DBUS_IFACE_ADD_BOOKVIEW = 'com.canonical.pim.AddressBookView'33DBUS_IFACE_ADD_BOOKVIEW = 'com.canonical.pim.AddressBookView'
3334
3435
35class ContacstDbusService(object):36class ContactsDbusService(object):
36 def __init__(self):37 def __init__(self):
37 self.bus = None38 self.bus = None
38 self.addr = None39 self.addr = None
@@ -94,6 +95,7 @@
94 uids.append(uid)95 uids.append(uid)
95 self.delete_contact(uids)96 self.delete_contact(uids)
9697
98
97def get_proxy_object_by_process_name(proc_name):99def get_proxy_object_by_process_name(proc_name):
98 """Helper function to return proxy object of a process100 """Helper function to return proxy object of a process
99101

Subscribers

People subscribed via source and target branches