ResolverPlayground: distinguish binpkg merge

diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py
index 1e2d64d7ba8a3b7349c928f15aac2358a5245489..8c806c74b4f5de21d8d99f03a1d78cbe36b01e11 100644 (file)
--- a/pym/portage/tests/resolver/ResolverPlayground.py
+++ b/pym/portage/tests/resolver/ResolverPlayground.py
@@ -215,6 +215,7 @@ class ResolverPlayground(object):
                        metadata = metadata.copy()
                        metadata.setdefault("SLOT", "0")
                        metadata.setdefault("KEYWORDS", "x86")
+                       metadata.setdefault("BUILD_TIME", "0")
                        metadata["CATEGORY"] = cat
                        metadata["PF"] = pf
 
@@ -243,6 +244,7 @@ class ResolverPlayground(object):
                        lic = metadata.pop("LICENSE", "")
                        properties = metadata.pop("PROPERTIES", "")
                        slot = metadata.pop("SLOT", 0)
+                       build_time = metadata.pop("BUILD_TIME", "0")
                        keywords = metadata.pop("KEYWORDS", "~x86")
                        iuse = metadata.pop("IUSE", "")
                        use = metadata.pop("USE", "")
@@ -261,6 +263,7 @@ class ResolverPlayground(object):
                                f.close()
                        
                        write_key("EAPI", eapi)
+                       write_key("BUILD_TIME", build_time)
                        write_key("COUNTER", "0")
                        write_key("LICENSE", lic)
                        write_key("PROPERTIES", properties)
@@ -622,8 +625,7 @@ class ResolverPlaygroundTestCase(object):
                                                        if cpv[:1] == "!":
                                                                new_got.append(cpv)
                                                                continue
-                                                       a = Atom("="+cpv, allow_repo=True)
-                                                       new_got.append(a.cpv)
+                                                       new_got.append(cpv.split(_repo_separator)[0])
                                                got = new_got
                                        if expected:
                                                new_expected = []
@@ -632,13 +634,13 @@ class ResolverPlaygroundTestCase(object):
                                                                if obj[:1] == "!":
                                                                        new_expected.append(obj)
                                                                        continue
-                                                               a = Atom("="+obj, allow_repo=True)
-                                                               new_expected.append(a.cpv)
+                                                               new_expected.append(
+                                                                       obj.split(_repo_separator)[0])
                                                                continue
                                                        new_expected.append(set())
                                                        for cpv in obj:
                                                                if cpv[:1] != "!":
-                                                                       cpv = Atom("="+cpv, allow_repo=True).cpv
+                                                                       cpv = cpv.split(_repo_separator)[0]
                                                                new_expected[-1].add(cpv)
                                                expected = new_expected
                                if self.ignore_mergelist_order and got is not None:
@@ -743,7 +745,10 @@ class ResolverPlaygroundResult(object):
                                        repo_str = ""
                                        if x.metadata["repository"] != "test_repo":
                                                repo_str = _repo_separator + x.metadata["repository"]
-                                       self.mergelist.append(x.cpv + repo_str)
+                                       mergelist_str = x.cpv + repo_str
+                                       if x.type_name == "binary":
+                                               mergelist_str = "[binary]" + mergelist_str
+                                       self.mergelist.append(mergelist_str)
 
                if self.depgraph._dynamic_config._needed_use_config_changes:
                        self.use_changes = {}

diff --git a/pym/portage/tests/resolver/test_simple.py b/pym/portage/tests/resolver/test_simple.py
index 62a589259dbb11f700d043e02f782c04eab0dd9c..324ffa2a6c655c3cbc40cdf95fa9ed2433e2c1f2 100644 (file)
--- a/pym/portage/tests/resolver/test_simple.py
+++ b/pym/portage/tests/resolver/test_simple.py
@@ -49,13 +49,13 @@ class SimpleResolverTestCase(TestCase):
                                ["dev-libs/B"],
                                options = {"--update": True, "--usepkg": True},
                                success = True,
-                               mergelist = ["dev-libs/B-1.2"]),
+                               mergelist = ["[binary]dev-libs/B-1.2"]),
 
                        ResolverPlaygroundTestCase(
                                ["dev-libs/B"],
                                options = {"--update": True, "--usepkgonly": True},
                                success = True,
-                               mergelist = ["dev-libs/B-1.2"]),
+                               mergelist = ["[binary]dev-libs/B-1.2"]),
 
                        ResolverPlaygroundTestCase(
                                ["app-misc/Z"],