1 |
commit: 9b3263f03f23eae1f88c03cd78a4fd05f1e2db68 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 29 07:23:13 2011 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 29 07:23:13 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9b3263f0 |
7 |
|
8 |
Fix env interference in emerge/repoman tests. |
9 |
|
10 |
--- |
11 |
pym/portage/tests/emerge/test_simple.py | 14 ++++++++------ |
12 |
pym/portage/tests/repoman/test_simple.py | 27 ++++++++++++++++++--------- |
13 |
2 files changed, 26 insertions(+), 15 deletions(-) |
14 |
|
15 |
diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py |
16 |
index a13d0e6..2aca3e3 100644 |
17 |
--- a/pym/portage/tests/emerge/test_simple.py |
18 |
+++ b/pym/portage/tests/emerge/test_simple.py |
19 |
@@ -74,9 +74,8 @@ class SimpleEmergeTestCase(TestCase): |
20 |
portage_tmpdir = os.path.join(eprefix, "var", "tmp", "portage") |
21 |
profile_path = settings.profile_path |
22 |
var_cache_edb = os.path.join(eprefix, "var", "cache", "edb") |
23 |
- env = os.environ.copy() |
24 |
|
25 |
- path = env.get("PATH") |
26 |
+ path = os.environ.get("PATH") |
27 |
if path is not None and not path.strip(): |
28 |
path = None |
29 |
if path is None: |
30 |
@@ -85,7 +84,7 @@ class SimpleEmergeTestCase(TestCase): |
31 |
path = ":" + path |
32 |
path = fake_bin + path |
33 |
|
34 |
- pythonpath = env.get("PYTHONPATH") |
35 |
+ pythonpath = os.environ.get("PYTHONPATH") |
36 |
if pythonpath is not None and not pythonpath.strip(): |
37 |
pythonpath = None |
38 |
if pythonpath is not None and \ |
39 |
@@ -98,15 +97,18 @@ class SimpleEmergeTestCase(TestCase): |
40 |
pythonpath = ":" + pythonpath |
41 |
pythonpath = PORTAGE_PYM_PATH + pythonpath |
42 |
|
43 |
- env['PYTHONPATH'] = pythonpath |
44 |
- env.update({ |
45 |
+ env = { |
46 |
"__PORTAGE_TEST_EPREFIX" : eprefix, |
47 |
"DISTDIR" : distdir, |
48 |
"INFODIR" : "", |
49 |
"INFOPATH" : "", |
50 |
"PATH" : path, |
51 |
+ "PORTAGE_GRPNAME" : os.environ["PORTAGE_GRPNAME"], |
52 |
"PORTAGE_TMPDIR" : portage_tmpdir, |
53 |
- }) |
54 |
+ "PORTAGE_USERNAME" : os.environ["PORTAGE_USERNAME"], |
55 |
+ "PYTHONPATH" : pythonpath, |
56 |
+ } |
57 |
+ |
58 |
dirs = [distdir, fake_bin, portage_tmpdir, var_cache_edb] |
59 |
true_symlinks = ["chown", "chgrp"] |
60 |
true_binary = find_binary("true") |
61 |
|
62 |
diff --git a/pym/portage/tests/repoman/test_simple.py b/pym/portage/tests/repoman/test_simple.py |
63 |
index b156789..ba50147 100644 |
64 |
--- a/pym/portage/tests/repoman/test_simple.py |
65 |
+++ b/pym/portage/tests/repoman/test_simple.py |
66 |
@@ -112,21 +112,30 @@ class SimpleRepomanTestCase(TestCase): |
67 |
portdir = settings["PORTDIR"] |
68 |
profiles_dir = os.path.join(portdir, "profiles") |
69 |
license_dir = os.path.join(portdir, "licenses") |
70 |
- env = os.environ.copy() |
71 |
- pythonpath = env.get("PYTHONPATH") |
72 |
+ |
73 |
+ pythonpath = os.environ.get("PYTHONPATH") |
74 |
if pythonpath is not None and not pythonpath.strip(): |
75 |
pythonpath = None |
76 |
- if pythonpath is None: |
77 |
- pythonpath = "" |
78 |
+ if pythonpath is not None and \ |
79 |
+ pythonpath.startswith(PORTAGE_PYM_PATH + ":"): |
80 |
+ pass |
81 |
else: |
82 |
- pythonpath = ":" + pythonpath |
83 |
- pythonpath = PORTAGE_PYM_PATH + pythonpath |
84 |
- env['PYTHONPATH'] = pythonpath |
85 |
- env.update({ |
86 |
+ if pythonpath is None: |
87 |
+ pythonpath = "" |
88 |
+ else: |
89 |
+ pythonpath = ":" + pythonpath |
90 |
+ pythonpath = PORTAGE_PYM_PATH + pythonpath |
91 |
+ |
92 |
+ env = { |
93 |
"__REPOMAN_TEST_EPREFIX" : eprefix, |
94 |
"DISTDIR" : distdir, |
95 |
+ "PATH" : os.environ["PATH"], |
96 |
+ "PORTAGE_GRPNAME" : os.environ["PORTAGE_GRPNAME"], |
97 |
+ "PORTAGE_USERNAME" : os.environ["PORTAGE_USERNAME"], |
98 |
"PORTDIR" : portdir, |
99 |
- }) |
100 |
+ "PYTHONPATH" : pythonpath, |
101 |
+ } |
102 |
+ |
103 |
dirs = [license_dir, profiles_dir, distdir] |
104 |
try: |
105 |
for d in dirs: |