webbrowser-app

Merge lp:~osomon/webbrowser-app/autopilot-temp-profile-config into lp:webbrowser-app

  1. autopilot-temp-profile-config
  2. Merge into trunk
Proposed by Olivier Tilloy on 2015-05-11
Status: Merged
Approved by: Olivier Tilloy on 2015-05-12
Approved revision: 985
Merged at revision: 1005
Proposed branch: lp:~osomon/webbrowser-app/autopilot-temp-profile-config
Merge into: lp:webbrowser-app
Diff against target: 18 lines (+8/-0)
1 file modified
tests/autopilot/webbrowser_app/tests/__init__.py (+8/-0)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/autopilot-temp-profile-config
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2015-05-11
Ubuntu Phablet Team 2015-05-11 Pending
Review via email: mp+258807@code.launchpad.net

Commit Message

Also set XDG_CONFIG_HOME (needed for tests not to override user-defined settings).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
2--- tests/autopilot/webbrowser_app/tests/__init__.py 2015-04-27 03:23:00 +0000
3+++ tests/autopilot/webbrowser_app/tests/__init__.py 2015-05-11 19:57:11 +0000
4@@ -65,6 +65,14 @@
5 if not os.path.exists(self.data_location):
6 os.makedirs(self.data_location)
7
8+ xdg_config = os.path.join(self._temp_xdg_dir, 'config')
9+ self.useFixture(fixtures.EnvironmentVariable(
10+ 'XDG_CONFIG_HOME',
11+ xdg_config))
12+ self.config_location = os.path.join(xdg_config, appname)
13+ if not os.path.exists(self.config_location):
14+ os.makedirs(self.config_location)
15+
16 xdg_cache = os.path.join(self._temp_xdg_dir, 'cache')
17 self.useFixture(fixtures.EnvironmentVariable(
18 'XDG_CACHE_HOME',

Subscribers

People subscribed via source and target branches

to status/vote changes: