pkgme service

Merge lp:~ricardokirkner/pkgme-service/absolute-pythonpath into lp:pkgme-service

  1. absolute-pythonpath
  2. Merge into trunk
Proposed by Ricardo Kirkner
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: 229
Merged at revision: 229
Proposed branch: lp:~ricardokirkner/pkgme-service/absolute-pythonpath
Merge into: lp:pkgme-service
Diff against target: 67 lines (+12/-6)
2 files modified
src/djpkgme/tasks.py (+2/-1)
src/djpkgme/tests/test_tasks.py (+10/-5)
To merge this branch: bzr merge lp:~ricardokirkner/pkgme-service/absolute-pythonpath
Reviewer Review Type Date Requested Status
Ricardo Kirkner (community) Approve
Review via email: mp+261215@code.launchpad.net

Commit message

use absolute path when setting PYTHONPATH

To post a comment you must log in.
Revision history for this message
Ricardo Kirkner (ricardokirkner) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/djpkgme/tasks.py'
2--- src/djpkgme/tasks.py 2015-06-04 18:54:58 +0000
3+++ src/djpkgme/tasks.py 2015-06-05 12:42:40 +0000
4@@ -524,7 +524,8 @@
5 cmd.append(json.dumps(overrides))
6 cmd_output = subprocess.check_output(
7 cmd,
8- env={'PYTHONPATH': settings.CLICK_REVIEWERS_TOOLS_BASE_PATH},
9+ env={'PYTHONPATH': os.path.abspath(
10+ settings.CLICK_REVIEWERS_TOOLS_BASE_PATH)},
11 stderr=subprocess.STDOUT)
12 except subprocess.CalledProcessError as e:
13 cmd_output = e.output
14
15=== modified file 'src/djpkgme/tests/test_tasks.py'
16--- src/djpkgme/tests/test_tasks.py 2015-06-04 18:54:58 +0000
17+++ src/djpkgme/tests/test_tasks.py 2015-06-05 12:42:40 +0000
18@@ -1228,7 +1228,8 @@
19 check_name)
20 mock_call.assert_called_with(
21 [script_path, package_path],
22- env={'PYTHONPATH': settings.CLICK_REVIEWERS_TOOLS_BASE_PATH},
23+ env = {'PYTHONPATH': os.path.abspath(
24+ settings.CLICK_REVIEWERS_TOOLS_BASE_PATH)},
25 stderr=subprocess.STDOUT)
26
27 @patch('djpkgme.tasks.subprocess.check_output')
28@@ -1254,7 +1255,8 @@
29 check_name)
30 mock_call.assert_called_with(
31 [script_path, package_path],
32- env={'PYTHONPATH': settings.CLICK_REVIEWERS_TOOLS_BASE_PATH},
33+ env = {'PYTHONPATH': os.path.abspath(
34+ settings.CLICK_REVIEWERS_TOOLS_BASE_PATH)},
35 stderr=subprocess.STDOUT)
36
37 @patch('djpkgme.tasks.subprocess.check_output')
38@@ -1286,7 +1288,8 @@
39 check_name)
40 mock_call.assert_called_with(
41 [script_path, package_path],
42- env={'PYTHONPATH': settings.CLICK_REVIEWERS_TOOLS_BASE_PATH},
43+ env = {'PYTHONPATH': os.path.abspath(
44+ settings.CLICK_REVIEWERS_TOOLS_BASE_PATH)},
45 stderr=subprocess.STDOUT)
46
47 @patch('djpkgme.tasks.subprocess.check_output')
48@@ -1311,7 +1314,8 @@
49 script_path = os.path.join(
50 settings.CLICK_REVIEWERS_TOOLS_BIN_PATH, check)
51 cmd = [script_path, package_path, '{"framework": {}}']
52- env = {'PYTHONPATH': settings.CLICK_REVIEWERS_TOOLS_BASE_PATH}
53+ env = {'PYTHONPATH': os.path.abspath(
54+ settings.CLICK_REVIEWERS_TOOLS_BASE_PATH)}
55 mock_check_output.assert_any_call(
56 cmd, env=env, stderr=subprocess.STDOUT)
57
58@@ -1425,7 +1429,8 @@
59 script_path = os.path.join(settings.CLICK_REVIEWERS_TOOLS_BIN_PATH,
60 check_name)
61 cmd = [script_path, downloaded_path, '{"framework": {}}']
62- env = {'PYTHONPATH': settings.CLICK_REVIEWERS_TOOLS_BASE_PATH}
63+ env = {'PYTHONPATH': os.path.abspath(
64+ settings.CLICK_REVIEWERS_TOOLS_BASE_PATH)}
65 mock_call.assert_any_call(cmd, env=env, stderr=subprocess.STDOUT)
66 self.assertEqual(3, len(results.keys()))
67 # there should be 4 successful checks:

Subscribers

People subscribed via source and target branches