diff options
author | Zac Medico <zmedico@gentoo.org> | 2012-08-29 13:23:22 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-08-29 13:23:22 -0700 |
commit | 78ba7f0d3a3a2defdf9807ef2e8138965490a2fc (patch) | |
tree | 10a549acf3569d3104291e38927cd8318318da09 /pym/portage/tests | |
parent | 9f14ed80e65a18da06e0834961ea032e3e830319 (diff) | |
download | portage-78ba7f0d3a3a2defdf9807ef2e8138965490a2fc.tar.gz portage-78ba7f0d3a3a2defdf9807ef2e8138965490a2fc.tar.bz2 portage-78ba7f0d3a3a2defdf9807ef2e8138965490a2fc.zip |
Rename slot-abi stuff to refer to slot-operator.
This makes it consistent with the language in the PMS eapi-5 branch:
http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=5d6749ac9e5ddc5b1daaad7737b65fa81c6ece47
Diffstat (limited to 'pym/portage/tests')
-rw-r--r-- | pym/portage/tests/dep/testAtom.py | 16 | ||||
-rw-r--r-- | pym/portage/tests/dep/test_match_from_list.py | 6 | ||||
-rw-r--r-- | pym/portage/tests/resolver/test_complete_graph.py | 4 | ||||
-rw-r--r-- | pym/portage/tests/resolver/test_slot_abi.py | 26 | ||||
-rw-r--r-- | pym/portage/tests/resolver/test_slot_abi_downgrade.py | 8 |
5 files changed, 30 insertions, 30 deletions
diff --git a/pym/portage/tests/dep/testAtom.py b/pym/portage/tests/dep/testAtom.py index f5a7d3749..0c72fd0e6 100644 --- a/pym/portage/tests/dep/testAtom.py +++ b/pym/portage/tests/dep/testAtom.py @@ -150,14 +150,14 @@ class TestAtom(TestCase): def testSlotAbiAtom(self): tests = ( - ("virtual/ffmpeg:0/53", "4-slot-abi", {"slot": "0", "slot_abi": "53", "slot_abi_op": None}), - ("virtual/ffmpeg:0/53=", "4-slot-abi", {"slot": "0", "slot_abi": "53", "slot_abi_op": "="}), - ("virtual/ffmpeg:=", "4-slot-abi", {"slot": None, "slot_abi": None, "slot_abi_op": "="}), - ("virtual/ffmpeg:0=", "4-slot-abi", {"slot": "0", "slot_abi": None, "slot_abi_op": "="}), - ("virtual/ffmpeg:*", "4-slot-abi", {"slot": None, "slot_abi": None, "slot_abi_op": "*"}), - ("virtual/ffmpeg:0*", "4-slot-abi", {"slot": "0", "slot_abi": None, "slot_abi_op": "*"}), - ("virtual/ffmpeg:0", "4-slot-abi", {"slot": "0", "slot_abi": None, "slot_abi_op": None}), - ("virtual/ffmpeg", "4-slot-abi", {"slot": None, "slot_abi": None, "slot_abi_op": None}), + ("virtual/ffmpeg:0/53", "4-slot-abi", {"slot": "0", "sub_slot": "53", "slot_operator": None}), + ("virtual/ffmpeg:0/53=", "4-slot-abi", {"slot": "0", "sub_slot": "53", "slot_operator": "="}), + ("virtual/ffmpeg:=", "4-slot-abi", {"slot": None, "sub_slot": None, "slot_operator": "="}), + ("virtual/ffmpeg:0=", "4-slot-abi", {"slot": "0", "sub_slot": None, "slot_operator": "="}), + ("virtual/ffmpeg:*", "4-slot-abi", {"slot": None, "sub_slot": None, "slot_operator": "*"}), + ("virtual/ffmpeg:0*", "4-slot-abi", {"slot": "0", "sub_slot": None, "slot_operator": "*"}), + ("virtual/ffmpeg:0", "4-slot-abi", {"slot": "0", "sub_slot": None, "slot_operator": None}), + ("virtual/ffmpeg", "4-slot-abi", {"slot": None, "sub_slot": None, "slot_operator": None}), ) for atom, eapi, parts in tests: diff --git a/pym/portage/tests/dep/test_match_from_list.py b/pym/portage/tests/dep/test_match_from_list.py index d5d718f74..2a1945b08 100644 --- a/pym/portage/tests/dep/test_match_from_list.py +++ b/pym/portage/tests/dep/test_match_from_list.py @@ -17,14 +17,14 @@ class Package(object): atom = Atom(atom, allow_repo=True) self.cp = atom.cp slot = atom.slot - if atom.slot_abi: - slot = "%s/%s" % (slot, atom.slot_abi) + if atom.sub_slot: + slot = "%s/%s" % (slot, atom.sub_slot) if not slot: slot = '0' self.cpv = _pkg_str(atom.cpv, slot=slot, repo=atom.repo) self.cpv_split = catpkgsplit(self.cpv) self.slot = self.cpv.slot - self.slot_abi = self.cpv.slot_abi + self.sub_slot = self.cpv.sub_slot self.repo = atom.repo if atom.use: self.use = self._use_class(atom.use.enabled) diff --git a/pym/portage/tests/resolver/test_complete_graph.py b/pym/portage/tests/resolver/test_complete_graph.py index 1b0342c67..95b1f8809 100644 --- a/pym/portage/tests/resolver/test_complete_graph.py +++ b/pym/portage/tests/resolver/test_complete_graph.py @@ -93,7 +93,7 @@ class CompleteGraphTestCase(TestCase): test_cases = ( ResolverPlaygroundTestCase( [">=sys-libs/x-2"], - options = {"--complete-graph-if-new-ver" : "n", "--rebuild-if-new-slot-abi": "n"}, + options = {"--complete-graph-if-new-ver" : "n", "--rebuild-if-new-slot": "n"}, mergelist = ["sys-libs/x-2"], success = True, ), @@ -106,7 +106,7 @@ class CompleteGraphTestCase(TestCase): ), ResolverPlaygroundTestCase( ["<sys-libs/x-1"], - options = {"--complete-graph-if-new-ver" : "n", "--rebuild-if-new-slot-abi": "n"}, + options = {"--complete-graph-if-new-ver" : "n", "--rebuild-if-new-slot": "n"}, mergelist = ["sys-libs/x-0.1"], success = True, ), diff --git a/pym/portage/tests/resolver/test_slot_abi.py b/pym/portage/tests/resolver/test_slot_abi.py index 6381bcc4d..8aed5d3d5 100644 --- a/pym/portage/tests/resolver/test_slot_abi.py +++ b/pym/portage/tests/resolver/test_slot_abi.py @@ -65,7 +65,7 @@ class SlotAbiTestCase(TestCase): ResolverPlaygroundTestCase( ["dev-libs/icu"], - options = {"--oneshot": True, "--ignore-built-slot-abi-deps": "y"}, + options = {"--oneshot": True, "--ignore-built-slot-operator-deps": "y"}, success = True, mergelist = ["dev-libs/icu-49"]), @@ -83,7 +83,7 @@ class SlotAbiTestCase(TestCase): ResolverPlaygroundTestCase( ["dev-libs/icu"], - options = {"--oneshot": True, "--usepkgonly": True, "--ignore-built-slot-abi-deps": "y"}, + options = {"--oneshot": True, "--usepkgonly": True, "--ignore-built-slot-operator-deps": "y"}, success = True, mergelist = ["[binary]dev-libs/icu-49"]), @@ -95,7 +95,7 @@ class SlotAbiTestCase(TestCase): ResolverPlaygroundTestCase( ["@world"], - options = {"--update": True, "--deep": True, "--ignore-built-slot-abi-deps": "y"}, + options = {"--update": True, "--deep": True, "--ignore-built-slot-operator-deps": "y"}, success = True, mergelist = ["dev-libs/icu-49"]), @@ -113,7 +113,7 @@ class SlotAbiTestCase(TestCase): ResolverPlaygroundTestCase( ["@world"], - options = {"--update": True, "--deep": True, "--usepkgonly": True, "--ignore-built-slot-abi-deps": "y"}, + options = {"--update": True, "--deep": True, "--usepkgonly": True, "--ignore-built-slot-operator-deps": "y"}, success = True, mergelist = ["[binary]dev-libs/icu-49"]), @@ -178,7 +178,7 @@ class SlotAbiTestCase(TestCase): ResolverPlaygroundTestCase( ["sys-libs/db"], - options = {"--oneshot": True, "--ignore-built-slot-abi-deps": "y"}, + options = {"--oneshot": True, "--ignore-built-slot-operator-deps": "y"}, success = True, mergelist = ["sys-libs/db-4.8"]), @@ -196,7 +196,7 @@ class SlotAbiTestCase(TestCase): ResolverPlaygroundTestCase( ["sys-libs/db"], - options = {"--oneshot": True, "--rebuild-if-new-slot-abi": "n"}, + options = {"--oneshot": True, "--rebuild-if-new-slot": "n"}, success = True, mergelist = ["sys-libs/db-4.8"]), @@ -214,7 +214,7 @@ class SlotAbiTestCase(TestCase): ResolverPlaygroundTestCase( ["@world"], - options = {"--update": True, "--deep": True, "--usepkg": True, "--ignore-built-slot-abi-deps": "y"}, + options = {"--update": True, "--deep": True, "--usepkg": True, "--ignore-built-slot-operator-deps": "y"}, success = True, mergelist = ["[binary]sys-libs/db-4.8"]), @@ -226,13 +226,13 @@ class SlotAbiTestCase(TestCase): ResolverPlaygroundTestCase( ["@world"], - options = {"--update": True, "--deep": True, "--usepkgonly": True, "--ignore-built-slot-abi-deps": "y"}, + options = {"--update": True, "--deep": True, "--usepkgonly": True, "--ignore-built-slot-operator-deps": "y"}, success = True, mergelist = ["[binary]sys-libs/db-4.8"]), ResolverPlaygroundTestCase( ["@world"], - options = {"--update": True, "--deep": True, "--rebuild-if-new-slot-abi": "n"}, + options = {"--update": True, "--deep": True, "--rebuild-if-new-slot": "n"}, success = True, mergelist = []), @@ -312,7 +312,7 @@ class SlotAbiTestCase(TestCase): ResolverPlaygroundTestCase( ["dev-libs/glib"], - options = {"--oneshot": True, "--ignore-built-slot-abi-deps": "y"}, + options = {"--oneshot": True, "--ignore-built-slot-operator-deps": "y"}, success = True, mergelist = ["dev-libs/glib-2.32.3"]), @@ -330,7 +330,7 @@ class SlotAbiTestCase(TestCase): ResolverPlaygroundTestCase( ["dev-libs/glib"], - options = {"--oneshot": True, "--usepkgonly": True, "--ignore-built-slot-abi-deps": "y"}, + options = {"--oneshot": True, "--usepkgonly": True, "--ignore-built-slot-operator-deps": "y"}, success = True, mergelist = ["[binary]dev-libs/glib-2.32.3"]), @@ -342,7 +342,7 @@ class SlotAbiTestCase(TestCase): ResolverPlaygroundTestCase( ["@world"], - options = {"--update": True, "--deep": True, "--ignore-built-slot-abi-deps": "y"}, + options = {"--update": True, "--deep": True, "--ignore-built-slot-operator-deps": "y"}, success = True, mergelist = ["dev-libs/glib-2.32.3"]), @@ -360,7 +360,7 @@ class SlotAbiTestCase(TestCase): ResolverPlaygroundTestCase( ["@world"], - options = {"--update": True, "--deep": True, "--usepkgonly": True, "--ignore-built-slot-abi-deps": "y"}, + options = {"--update": True, "--deep": True, "--usepkgonly": True, "--ignore-built-slot-operator-deps": "y"}, success = True, mergelist = ["[binary]dev-libs/glib-2.32.3"]), diff --git a/pym/portage/tests/resolver/test_slot_abi_downgrade.py b/pym/portage/tests/resolver/test_slot_abi_downgrade.py index 45a7555c2..08e9a9db2 100644 --- a/pym/portage/tests/resolver/test_slot_abi_downgrade.py +++ b/pym/portage/tests/resolver/test_slot_abi_downgrade.py @@ -61,7 +61,7 @@ class SlotAbiDowngradeTestCase(TestCase): ResolverPlaygroundTestCase( ["dev-libs/icu"], - options = {"--oneshot": True, "--ignore-built-slot-abi-deps": "y"}, + options = {"--oneshot": True, "--ignore-built-slot-operator-deps": "y"}, success = True, mergelist = ["dev-libs/icu-4.8"]), @@ -85,7 +85,7 @@ class SlotAbiDowngradeTestCase(TestCase): ResolverPlaygroundTestCase( ["@world"], - options = {"--update": True, "--deep": True, "--ignore-built-slot-abi-deps": "y"}, + options = {"--update": True, "--deep": True, "--ignore-built-slot-operator-deps": "y"}, success = True, mergelist = ["dev-libs/icu-4.8"]), @@ -173,7 +173,7 @@ class SlotAbiDowngradeTestCase(TestCase): ResolverPlaygroundTestCase( ["dev-libs/glib"], - options = {"--oneshot": True, "--ignore-built-slot-abi-deps": "y"}, + options = {"--oneshot": True, "--ignore-built-slot-operator-deps": "y"}, success = True, mergelist = ["dev-libs/glib-2.30.2"]), @@ -197,7 +197,7 @@ class SlotAbiDowngradeTestCase(TestCase): ResolverPlaygroundTestCase( ["@world"], - options = {"--update": True, "--deep": True, "--ignore-built-slot-abi-deps": "y"}, + options = {"--update": True, "--deep": True, "--ignore-built-slot-operator-deps": "y"}, success = True, mergelist = ["dev-libs/glib-2.30.2"]), |