Merge lp:~canonical-platform-qa/ubuntu-terminal-app/fix_home_dir_in_test into lp:ubuntu-terminal-app

Proposed by Omer Akram
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 154
Merged at revision: 154
Proposed branch: lp:~canonical-platform-qa/ubuntu-terminal-app/fix_home_dir_in_test
Merge into: lp:ubuntu-terminal-app
Diff against target: 12 lines (+1/-1)
1 file modified
tests/autopilot/ubuntu_terminal_app/tests/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~canonical-platform-qa/ubuntu-terminal-app/fix_home_dir_in_test
Reviewer Review Type Date Requested Status
Nicholas Skaggs (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+236691@code.launchpad.net

Commit message

the recent landing brought in the use of a home directory variable which was never assigned to anything. Fix that.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/__init__.py'
2--- tests/autopilot/ubuntu_terminal_app/tests/__init__.py 2014-09-23 19:45:34 +0000
3+++ tests/autopilot/ubuntu_terminal_app/tests/__init__.py 2014-10-01 12:13:09 +0000
4@@ -110,7 +110,7 @@
5
6 def get_local_desktop_file_directory(self):
7 return os.path.join(
8- self.real_home_dir, '.local', 'share', 'applications')
9+ os.path.expanduser('~'), '.local', 'share', 'applications')
10
11 def get_named_temporary_file(
12 self, dir=None, mode='w+t', delete=False, suffix=''):

Subscribers

People subscribed via source and target branches