From 78ba7f0d3a3a2defdf9807ef2e8138965490a2fc Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 29 Aug 2012 13:23:22 -0700
Subject: 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
---
 pym/portage/tests/resolver/test_complete_graph.py  |  4 ++--
 pym/portage/tests/resolver/test_slot_abi.py        | 26 +++++++++++-----------
 .../tests/resolver/test_slot_abi_downgrade.py      |  8 +++----
 3 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'pym/portage/tests/resolver')

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"]),
 
-- 
cgit v1.2.3-1-g7c22