[gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/

[Zac Medico]

commit:     097cf78c22b3d523f701ab36f47714c604690b23
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 26 06:20:17 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jan 26 06:27:00 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=097cf78c

OrChoicesTestCase: split out bug 480736 libpostproc test case

This case will become an expected failure after bug 706278
is fixed. The packages that triggered bug 480736 not longer
exist.

Bug: https://bugs.gentoo.org/480736
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/portage/tests/resolver/test_or_choices.py | 115 +++++++++++++-------------
 1 file changed, 59 insertions(+), 56 deletions(-)

diff --git a/lib/portage/tests/resolver/test_or_choices.py b/lib/portage/tests/resolver/test_or_choices.py
index 63e62d010..c0316bfb3 100644
--- a/lib/portage/tests/resolver/test_or_choices.py
+++ b/lib/portage/tests/resolver/test_or_choices.py
@@ -78,62 +78,6 @@ class OrChoicesTestCase(TestCase):
 		finally:
 			playground.cleanup()
 
-	def testOrChoicesLibpostproc(self):
-		ebuilds = {
-			"media-video/ffmpeg-0.10" : {
-				"EAPI": "5",
-				"SLOT": "0.10"
-			},
-			"media-video/ffmpeg-1.2.2" : {
-				"EAPI": "5",
-				"SLOT": "0"
-			},
-			"media-libs/libpostproc-0.8.0.20121125" : {
-				"EAPI": "5"
-			},
-			"media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r1" : {
-				"EAPI": "5",
-				"RDEPEND" : "|| ( media-video/ffmpeg:0 media-libs/libpostproc )"
-			},
-		}
-
-		installed = {
-			"media-video/ffmpeg-0.10" : {
-				"EAPI": "5",
-				"SLOT": "0.10"
-			},
-			"media-libs/libpostproc-0.8.0.20121125" : {
-				"EAPI": "5"
-			},
-			"media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r1" : {
-				"EAPI": "5",
-				"RDEPEND" : "|| ( media-video/ffmpeg:0 media-libs/libpostproc )"
-			},
-		}
-
-		world = ["media-plugins/gst-plugins-ffmpeg"]
-
-		test_cases = (
-			# Demonstrate that libpostproc is preferred
-			# over ffmpeg:0 for bug #480736.
-			ResolverPlaygroundTestCase(
-				["@world"],
-				options = {"--update": True, "--deep": True},
-				success=True,
-				all_permutations = True,
-				mergelist = []),
-		)
-
-		playground = ResolverPlayground(ebuilds=ebuilds, installed=installed,
-			world=world, debug=False)
-		try:
-			for test_case in test_cases:
-				playground.run_TestCase(test_case)
-				self.assertEqual(test_case.test_success, True, test_case.fail_msg)
-		finally:
-			playground.cleanup()
-
-
 	def testInitiallyUnsatisfied(self):
 
 		ebuilds = {
@@ -340,3 +284,62 @@ class OrChoicesTestCase(TestCase):
 			# Disable debug so that cleanup works.
 			playground.debug = False
 			playground.cleanup()
+
+class OrChoicesLibpostprocTestCase(TestCase):
+
+	def testOrChoicesLibpostproc(self):
+
+		ebuilds = {
+			"media-video/ffmpeg-0.10" : {
+				"EAPI": "5",
+				"SLOT": "0.10"
+			},
+			"media-video/ffmpeg-1.2.2" : {
+				"EAPI": "5",
+				"SLOT": "0"
+			},
+			"media-libs/libpostproc-0.8.0.20121125" : {
+				"EAPI": "5"
+			},
+			"media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r1" : {
+				"EAPI": "5",
+				"RDEPEND" : "|| ( media-video/ffmpeg:0 media-libs/libpostproc )"
+			},
+		}
+
+		installed = {
+			"media-video/ffmpeg-0.10" : {
+				"EAPI": "5",
+				"SLOT": "0.10"
+			},
+			"media-libs/libpostproc-0.8.0.20121125" : {
+				"EAPI": "5"
+			},
+			"media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r1" : {
+				"EAPI": "5",
+				"RDEPEND" : "|| ( media-video/ffmpeg:0 media-libs/libpostproc )"
+			},
+		}
+
+		world = ["media-plugins/gst-plugins-ffmpeg"]
+
+		test_cases = (
+			# Demonstrate that libpostproc is preferred
+			# over ffmpeg:0 for bug #480736.
+			ResolverPlaygroundTestCase(
+				["@world"],
+				options = {"--update": True, "--deep": True},
+				success=True,
+				all_permutations = True,
+				mergelist = []),
+		)
+
+		playground = ResolverPlayground(ebuilds=ebuilds, installed=installed,
+			world=world, debug=False)
+		try:
+			for test_case in test_cases:
+				playground.run_TestCase(test_case)
+				self.assertEqual(test_case.test_success, True, test_case.fail_msg)
+		finally:
+			playground.debug = False
+			playground.cleanup()