From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 17 Aug 2010 14:38:13 +0000 (-0700)
Subject: Tweak the EbuildSpawnProcess test and add comments.
X-Git-Tag: v2.2_rc68~126
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=080bd63355b3a73bce92a7bf23c51e192209bd48;p=portage.git

Tweak the EbuildSpawnProcess test and add comments.
---

diff --git a/pym/portage/tests/ebuild/test_doebuild_spawn.py b/pym/portage/tests/ebuild/test_doebuild_spawn.py
index 32123e279..c8a8095d3 100644
--- a/pym/portage/tests/ebuild/test_doebuild_spawn.py
+++ b/pym/portage/tests/ebuild/test_doebuild_spawn.py
@@ -19,7 +19,7 @@ class DoebuildSpawnTestCase(TestCase):
 	Invoke portage.package.ebuild.doebuild.spawn() with a
 	minimal environment. This gives coverage to some of
 	the ebuild execution internals, like ebuild.sh,
-	EbuildSpawnProcess, and EbuildIpcDaemon.
+	AbstractEbuildProcess, and EbuildIpcDaemon.
 	"""
 
 	def testDoebuildSpawn(self):
@@ -54,8 +54,14 @@ class DoebuildSpawnTestCase(TestCase):
 
 			task_scheduler = TaskScheduler()
 			for phase in ('_internal_test',):
-				rval = doebuild_spawn(
-					"%s %s" % (_shell_quote(EBUILD_SH_BINARY), phase),
+
+				# Test EbuildSpawnProcess by calling doebuild.spawn() with
+				# returnpid=False. This case is no longer used by portage
+				# internals since EbuildPhase is used instead and that passes
+				# returnpid=True to doebuild.spawn().
+				rval = doebuild_spawn("%s %s" % (_shell_quote(
+					os.path.join(settings["PORTAGE_BIN_PATH"],
+					os.path.basename(EBUILD_SH_BINARY))), phase),
 					settings, free=1)
 				self.assertEqual(rval, os.EX_OK)