1 |
commit: 58077c76a911a3ab5bdea0a30a3bd192faaf12e0 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 20 09:51:32 2012 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 20 09:51:32 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=58077c76 |
7 |
|
8 |
ResolverPlayground: distinguish binpkg merge |
9 |
|
10 |
--- |
11 |
pym/portage/tests/resolver/ResolverPlayground.py | 17 +++++++++++------ |
12 |
pym/portage/tests/resolver/test_simple.py | 4 ++-- |
13 |
2 files changed, 13 insertions(+), 8 deletions(-) |
14 |
|
15 |
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py |
16 |
index 1e2d64d..8c806c7 100644 |
17 |
--- a/pym/portage/tests/resolver/ResolverPlayground.py |
18 |
+++ b/pym/portage/tests/resolver/ResolverPlayground.py |
19 |
@@ -215,6 +215,7 @@ class ResolverPlayground(object): |
20 |
metadata = metadata.copy() |
21 |
metadata.setdefault("SLOT", "0") |
22 |
metadata.setdefault("KEYWORDS", "x86") |
23 |
+ metadata.setdefault("BUILD_TIME", "0") |
24 |
metadata["CATEGORY"] = cat |
25 |
metadata["PF"] = pf |
26 |
|
27 |
@@ -243,6 +244,7 @@ class ResolverPlayground(object): |
28 |
lic = metadata.pop("LICENSE", "") |
29 |
properties = metadata.pop("PROPERTIES", "") |
30 |
slot = metadata.pop("SLOT", 0) |
31 |
+ build_time = metadata.pop("BUILD_TIME", "0") |
32 |
keywords = metadata.pop("KEYWORDS", "~x86") |
33 |
iuse = metadata.pop("IUSE", "") |
34 |
use = metadata.pop("USE", "") |
35 |
@@ -261,6 +263,7 @@ class ResolverPlayground(object): |
36 |
f.close() |
37 |
|
38 |
write_key("EAPI", eapi) |
39 |
+ write_key("BUILD_TIME", build_time) |
40 |
write_key("COUNTER", "0") |
41 |
write_key("LICENSE", lic) |
42 |
write_key("PROPERTIES", properties) |
43 |
@@ -622,8 +625,7 @@ class ResolverPlaygroundTestCase(object): |
44 |
if cpv[:1] == "!": |
45 |
new_got.append(cpv) |
46 |
continue |
47 |
- a = Atom("="+cpv, allow_repo=True) |
48 |
- new_got.append(a.cpv) |
49 |
+ new_got.append(cpv.split(_repo_separator)[0]) |
50 |
got = new_got |
51 |
if expected: |
52 |
new_expected = [] |
53 |
@@ -632,13 +634,13 @@ class ResolverPlaygroundTestCase(object): |
54 |
if obj[:1] == "!": |
55 |
new_expected.append(obj) |
56 |
continue |
57 |
- a = Atom("="+obj, allow_repo=True) |
58 |
- new_expected.append(a.cpv) |
59 |
+ new_expected.append( |
60 |
+ obj.split(_repo_separator)[0]) |
61 |
continue |
62 |
new_expected.append(set()) |
63 |
for cpv in obj: |
64 |
if cpv[:1] != "!": |
65 |
- cpv = Atom("="+cpv, allow_repo=True).cpv |
66 |
+ cpv = cpv.split(_repo_separator)[0] |
67 |
new_expected[-1].add(cpv) |
68 |
expected = new_expected |
69 |
if self.ignore_mergelist_order and got is not None: |
70 |
@@ -743,7 +745,10 @@ class ResolverPlaygroundResult(object): |
71 |
repo_str = "" |
72 |
if x.metadata["repository"] != "test_repo": |
73 |
repo_str = _repo_separator + x.metadata["repository"] |
74 |
- self.mergelist.append(x.cpv + repo_str) |
75 |
+ mergelist_str = x.cpv + repo_str |
76 |
+ if x.type_name == "binary": |
77 |
+ mergelist_str = "[binary]" + mergelist_str |
78 |
+ self.mergelist.append(mergelist_str) |
79 |
|
80 |
if self.depgraph._dynamic_config._needed_use_config_changes: |
81 |
self.use_changes = {} |
82 |
|
83 |
diff --git a/pym/portage/tests/resolver/test_simple.py b/pym/portage/tests/resolver/test_simple.py |
84 |
index 62a5892..324ffa2 100644 |
85 |
--- a/pym/portage/tests/resolver/test_simple.py |
86 |
+++ b/pym/portage/tests/resolver/test_simple.py |
87 |
@@ -49,13 +49,13 @@ class SimpleResolverTestCase(TestCase): |
88 |
["dev-libs/B"], |
89 |
options = {"--update": True, "--usepkg": True}, |
90 |
success = True, |
91 |
- mergelist = ["dev-libs/B-1.2"]), |
92 |
+ mergelist = ["[binary]dev-libs/B-1.2"]), |
93 |
|
94 |
ResolverPlaygroundTestCase( |
95 |
["dev-libs/B"], |
96 |
options = {"--update": True, "--usepkgonly": True}, |
97 |
success = True, |
98 |
- mergelist = ["dev-libs/B-1.2"]), |
99 |
+ mergelist = ["[binary]dev-libs/B-1.2"]), |
100 |
|
101 |
ResolverPlaygroundTestCase( |
102 |
["app-misc/Z"], |