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/dep | |
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/dep')
-rw-r--r-- | pym/portage/tests/dep/testAtom.py | 16 | ||||
-rw-r--r-- | pym/portage/tests/dep/test_match_from_list.py | 6 |
2 files changed, 11 insertions, 11 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) |