Attachment #364474 for bug #492932

View | Details | Raw Unified | Return to bug 492932
Collapse All | Expand All

Lines 55-61 class LocationsManager(object): Link Here

(-)a/pym/portage/package/ebuild/_config/LocationsManager.py (-1 / +1 lines)
55	self.eprefix = ""	55	self.eprefix = ""
56		56
57	if self.config_root is None:	57	if self.config_root is None:
58	self.config_root = portage.const.EPREFIX + os.sep	58	self.config_root = self.eprefix + os.sep
59		59
60	self.config_root = normalize_path(os.path.abspath(	60	self.config_root = normalize_path(os.path.abspath(
61	self.config_root)).rstrip(os.path.sep) + os.path.sep	61	self.config_root)).rstrip(os.path.sep) + os.path.sep





	def testSimple(self):

		debug = True

		install_something = """
S="${WORKDIR}"

		cross_prefix = os.path.join(eprefix, "cross_prefix")

		test_commands = (
			#~ env_update_cmd,
			#~ portageq_cmd + ("envvar", "-v", "CONFIG_PROTECT", "EROOT",
				#~ "PORTAGE_CONFIGROOT", "PORTAGE_TMPDIR", "USERLAND"),
			#~ etc_update_cmd,
			#~ dispatch_conf_cmd,
			#~ emerge_cmd + ("--version",),
			#~ emerge_cmd + ("--info",),
			#~ emerge_cmd + ("--info", "--verbose"),
			#~ emerge_cmd + ("--list-sets",),
			#~ emerge_cmd + ("--check-news",),
			#~ rm_cmd + ("-rf", cachedir),
			#~ rm_cmd + ("-rf", cachedir_pregen),
			#~ emerge_cmd + ("--regen",),
			#~ rm_cmd + ("-rf", cachedir),
			#~ ({"FEATURES" : "metadata-transfer"},) + \
				#~ emerge_cmd + ("--regen",),
			#~ rm_cmd + ("-rf", cachedir),
			#~ ({"FEATURES" : "metadata-transfer"},) + \
				#~ emerge_cmd + ("--regen",),
			#~ rm_cmd + ("-rf", cachedir),
			#~ egencache_cmd + ("--update",) + tuple(egencache_extra_args),
			#~ ({"FEATURES" : "metadata-transfer"},) + \
				#~ emerge_cmd + ("--metadata",),
			#~ rm_cmd + ("-rf", cachedir),
			#~ ({"FEATURES" : "metadata-transfer"},) + \
				#~ emerge_cmd + ("--metadata",),
			#~ emerge_cmd + ("--metadata",),
			#~ rm_cmd + ("-rf", cachedir),
			#~ emerge_cmd + ("--oneshot", "virtual/foo"),
			#~ emerge_cmd + ("--pretend", "dev-libs/A"),
			#~ ebuild_cmd + (test_ebuild, "manifest", "clean", "package", "merge"),
			#~ emerge_cmd + ("--pretend", "--tree", "--complete-graph", "dev-libs/A"),
			#~ emerge_cmd + ("-p", "dev-libs/B"),
			#~ emerge_cmd + ("-B", "dev-libs/B",),
			#~ emerge_cmd + ("--oneshot", "--usepkg", "dev-libs/B",),
#~ 
			#~ # trigger clean prior to pkg_pretend as in bug #390711
			#~ ebuild_cmd + (test_ebuild, "unpack"), 
			#~ emerge_cmd + ("--oneshot", "dev-libs/A",),
#~ 
			#~ emerge_cmd + ("--noreplace", "dev-libs/A",),
			#~ emerge_cmd + ("--config", "dev-libs/A",),
			#~ emerge_cmd + ("--info", "dev-libs/A", "dev-libs/B"),
			#~ emerge_cmd + ("--pretend", "--depclean", "--verbose", "dev-libs/B"),
			#~ emerge_cmd + ("--pretend", "--depclean",),
			#~ emerge_cmd + ("--depclean",),
			#~ quickpkg_cmd + ("dev-libs/A",),
			#~ emerge_cmd + ("--usepkgonly", "dev-libs/A"),
			#~ emaint_cmd + ("--check", "all"),
			#~ emaint_cmd + ("--fix", "all"),
			#~ fixpackages_cmd,
			#~ regenworld_cmd,
			#~ portageq_cmd + ("match", eroot, "dev-libs/A"),
			#~ portageq_cmd + ("best_visible", eroot, "dev-libs/A"),
			#~ portageq_cmd + ("best_visible", eroot, "binary", "dev-libs/A"),
			#~ portageq_cmd + ("contents", eroot, "dev-libs/A-1"),
			#~ portageq_cmd + ("metadata", eroot, "ebuild", "dev-libs/A-1", "EAPI", "IUSE", "RDEPEND"),
			#~ portageq_cmd + ("metadata", eroot, "binary", "dev-libs/A-1", "EAPI", "USE", "RDEPEND"),
			#~ portageq_cmd + ("metadata", eroot, "installed", "dev-libs/A-1", "EAPI", "USE", "RDEPEND"),
			#~ portageq_cmd + ("owners", eroot, eroot + "usr"),
			#~ emerge_cmd + ("-p", eroot + "usr"),
			#~ emerge_cmd + ("-p", "--unmerge", "-q", eroot + "usr"),
			#~ emerge_cmd + ("--unmerge", "--quiet", "dev-libs/A"),
			#~ emerge_cmd + ("-C", "--quiet", "dev-libs/B"),

			# Test cross-prefix usage, including chpathtool for binpkgs.
			({"EPREFIX" : cross_prefix},) + \
				emerge_cmd + ("--usepkgonly", "dev-libs/A"),
			#({"EPREFIX" : cross_prefix},) + \
			#	portageq_cmd + ("has_version", cross_prefix, "dev-libs/A"),
			#({"EPREFIX" : cross_prefix},) + \
			#	portageq_cmd + ("has_version", cross_prefix, "dev-libs/B"),
			#({"EPREFIX" : cross_prefix},) + \
			#	emerge_cmd + ("-C", "--quiet", "dev-libs/B"),
			#({"EPREFIX" : cross_prefix},) + \
			#	emerge_cmd + ("-C", "--quiet", "dev-libs/A"),
			#({"EPREFIX" : cross_prefix},) + \
			#	emerge_cmd + ("dev-libs/A",),
			#({"EPREFIX" : cross_prefix},) + \
			#	portageq_cmd + ("has_version", cross_prefix, "dev-libs/A"),
			#({"EPREFIX" : cross_prefix},) + \
			#	portageq_cmd + ("has_version", cross_prefix, "dev-libs/B"),
		)

		distdir = playground.distdir

		portage_tmpdir = os.path.join(eprefix, "var", "tmp", "portage")
		profile_path = settings.profile_path
		user_config_dir = os.path.join(os.sep, eprefix, USER_CONFIG_PATH)
		cross_prefix_user_config_dir = os.path.join(cross_prefix, USER_CONFIG_PATH)

		path =  os.environ.get("PATH")
		if path is not None and not path.strip():

				os.environ["__PORTAGE_TEST_HARDLINK_LOCKS"]

		updates_dir = os.path.join(test_repo_location, "profiles", "updates")
		dirs = [cachedir, cachedir_pregen, cross_prefix, cross_prefix_user_config_dir, 
			distdir, fake_bin, portage_tmpdir, updates_dir,
			user_config_dir, var_cache_edb]
		etc_symlinks = ("dispatch-conf.conf", "etc-update.conf")
		# Override things that may be unavailable, or may have portability

slotmove =app-doc/pms-3 2 3
move dev-util/git dev-vcs/git
""")
			os.symlink(os.path.join(test_repo_location, "profiles", "default", "linux",
				"x86", "test_profile"), os.path.join(cross_prefix, "etc", "portage", "make.profile"))

			if debug:
				# The subprocess inherits both stdout and stderr, for

				self.assertEqual(os.EX_OK, proc.returncode,
					"emerge failed with args %s" % (args,))
		finally:
			#playground.cleanup()
			pass
- 

Return to bug 492932

Lines 26-32 class SimpleEmergeTestCase(TestCase): Link Here

(-)a/pym/portage/tests/emerge/test_simple.py (-83 / +86 lines)
26		26
27	def testSimple(self):	27	def testSimple(self):
28		28
29	debug = False	29	debug = True
30		30
31	install_something = """	31	install_something = """
32	S="${WORKDIR}"	32	S="${WORKDIR}"
Lines 214-301 pkg_preinst() { Link Here
214	cross_prefix = os.path.join(eprefix, "cross_prefix")	214	cross_prefix = os.path.join(eprefix, "cross_prefix")
215		215
216	test_commands = (	216	test_commands = (
217	env_update_cmd,	217	#~ env_update_cmd,
218	portageq_cmd + ("envvar", "-v", "CONFIG_PROTECT", "EROOT",	218	#~ portageq_cmd + ("envvar", "-v", "CONFIG_PROTECT", "EROOT",
219	"PORTAGE_CONFIGROOT", "PORTAGE_TMPDIR", "USERLAND"),	219	#~ "PORTAGE_CONFIGROOT", "PORTAGE_TMPDIR", "USERLAND"),
220	etc_update_cmd,	220	#~ etc_update_cmd,
221	dispatch_conf_cmd,	221	#~ dispatch_conf_cmd,
222	emerge_cmd + ("--version",),	222	#~ emerge_cmd + ("--version",),
223	emerge_cmd + ("--info",),	223	#~ emerge_cmd + ("--info",),
224	emerge_cmd + ("--info", "--verbose"),	224	#~ emerge_cmd + ("--info", "--verbose"),
225	emerge_cmd + ("--list-sets",),	225	#~ emerge_cmd + ("--list-sets",),
226	emerge_cmd + ("--check-news",),	226	#~ emerge_cmd + ("--check-news",),
227	rm_cmd + ("-rf", cachedir),	227	#~ rm_cmd + ("-rf", cachedir),
228	rm_cmd + ("-rf", cachedir_pregen),	228	#~ rm_cmd + ("-rf", cachedir_pregen),
229	emerge_cmd + ("--regen",),	229	#~ emerge_cmd + ("--regen",),
230	rm_cmd + ("-rf", cachedir),	230	#~ rm_cmd + ("-rf", cachedir),
231	({"FEATURES" : "metadata-transfer"},) + \	231	#~ ({"FEATURES" : "metadata-transfer"},) + \
232	emerge_cmd + ("--regen",),	232	#~ emerge_cmd + ("--regen",),
233	rm_cmd + ("-rf", cachedir),	233	#~ rm_cmd + ("-rf", cachedir),
234	({"FEATURES" : "metadata-transfer"},) + \	234	#~ ({"FEATURES" : "metadata-transfer"},) + \
235	emerge_cmd + ("--regen",),	235	#~ emerge_cmd + ("--regen",),
236	rm_cmd + ("-rf", cachedir),	236	#~ rm_cmd + ("-rf", cachedir),
237	egencache_cmd + ("--update",) + tuple(egencache_extra_args),	237	#~ egencache_cmd + ("--update",) + tuple(egencache_extra_args),
238	({"FEATURES" : "metadata-transfer"},) + \	238	#~ ({"FEATURES" : "metadata-transfer"},) + \
239	emerge_cmd + ("--metadata",),	239	#~ emerge_cmd + ("--metadata",),
240	rm_cmd + ("-rf", cachedir),	240	#~ rm_cmd + ("-rf", cachedir),
241	({"FEATURES" : "metadata-transfer"},) + \	241	#~ ({"FEATURES" : "metadata-transfer"},) + \
242	emerge_cmd + ("--metadata",),	242	#~ emerge_cmd + ("--metadata",),
243	emerge_cmd + ("--metadata",),	243	#~ emerge_cmd + ("--metadata",),
244	rm_cmd + ("-rf", cachedir),	244	#~ rm_cmd + ("-rf", cachedir),
245	emerge_cmd + ("--oneshot", "virtual/foo"),	245	#~ emerge_cmd + ("--oneshot", "virtual/foo"),
246	emerge_cmd + ("--pretend", "dev-libs/A"),	246	#~ emerge_cmd + ("--pretend", "dev-libs/A"),
247	ebuild_cmd + (test_ebuild, "manifest", "clean", "package", "merge"),	247	#~ ebuild_cmd + (test_ebuild, "manifest", "clean", "package", "merge"),
248	emerge_cmd + ("--pretend", "--tree", "--complete-graph", "dev-libs/A"),	248	#~ emerge_cmd + ("--pretend", "--tree", "--complete-graph", "dev-libs/A"),
249	emerge_cmd + ("-p", "dev-libs/B"),	249	#~ emerge_cmd + ("-p", "dev-libs/B"),
250	emerge_cmd + ("-B", "dev-libs/B",),	250	#~ emerge_cmd + ("-B", "dev-libs/B",),
251	emerge_cmd + ("--oneshot", "--usepkg", "dev-libs/B",),	251	#~ emerge_cmd + ("--oneshot", "--usepkg", "dev-libs/B",),
252		252	#~
253	# trigger clean prior to pkg_pretend as in bug #390711	253	#~ # trigger clean prior to pkg_pretend as in bug #390711
254	ebuild_cmd + (test_ebuild, "unpack"),	254	#~ ebuild_cmd + (test_ebuild, "unpack"),
255	emerge_cmd + ("--oneshot", "dev-libs/A",),	255	#~ emerge_cmd + ("--oneshot", "dev-libs/A",),
256		256	#~
257	emerge_cmd + ("--noreplace", "dev-libs/A",),	257	#~ emerge_cmd + ("--noreplace", "dev-libs/A",),
258	emerge_cmd + ("--config", "dev-libs/A",),	258	#~ emerge_cmd + ("--config", "dev-libs/A",),
259	emerge_cmd + ("--info", "dev-libs/A", "dev-libs/B"),	259	#~ emerge_cmd + ("--info", "dev-libs/A", "dev-libs/B"),
260	emerge_cmd + ("--pretend", "--depclean", "--verbose", "dev-libs/B"),	260	#~ emerge_cmd + ("--pretend", "--depclean", "--verbose", "dev-libs/B"),
261	emerge_cmd + ("--pretend", "--depclean",),	261	#~ emerge_cmd + ("--pretend", "--depclean",),
262	emerge_cmd + ("--depclean",),	262	#~ emerge_cmd + ("--depclean",),
263	quickpkg_cmd + ("dev-libs/A",),	263	#~ quickpkg_cmd + ("dev-libs/A",),
264	emerge_cmd + ("--usepkgonly", "dev-libs/A"),	264	#~ emerge_cmd + ("--usepkgonly", "dev-libs/A"),
265	emaint_cmd + ("--check", "all"),	265	#~ emaint_cmd + ("--check", "all"),
266	emaint_cmd + ("--fix", "all"),	266	#~ emaint_cmd + ("--fix", "all"),
267	fixpackages_cmd,	267	#~ fixpackages_cmd,
268	regenworld_cmd,	268	#~ regenworld_cmd,
269	portageq_cmd + ("match", eroot, "dev-libs/A"),	269	#~ portageq_cmd + ("match", eroot, "dev-libs/A"),
270	portageq_cmd + ("best_visible", eroot, "dev-libs/A"),	270	#~ portageq_cmd + ("best_visible", eroot, "dev-libs/A"),
271	portageq_cmd + ("best_visible", eroot, "binary", "dev-libs/A"),	271	#~ portageq_cmd + ("best_visible", eroot, "binary", "dev-libs/A"),
272	portageq_cmd + ("contents", eroot, "dev-libs/A-1"),	272	#~ portageq_cmd + ("contents", eroot, "dev-libs/A-1"),
273	portageq_cmd + ("metadata", eroot, "ebuild", "dev-libs/A-1", "EAPI", "IUSE", "RDEPEND"),	273	#~ portageq_cmd + ("metadata", eroot, "ebuild", "dev-libs/A-1", "EAPI", "IUSE", "RDEPEND"),
274	portageq_cmd + ("metadata", eroot, "binary", "dev-libs/A-1", "EAPI", "USE", "RDEPEND"),	274	#~ portageq_cmd + ("metadata", eroot, "binary", "dev-libs/A-1", "EAPI", "USE", "RDEPEND"),
275	portageq_cmd + ("metadata", eroot, "installed", "dev-libs/A-1", "EAPI", "USE", "RDEPEND"),	275	#~ portageq_cmd + ("metadata", eroot, "installed", "dev-libs/A-1", "EAPI", "USE", "RDEPEND"),
276	portageq_cmd + ("owners", eroot, eroot + "usr"),	276	#~ portageq_cmd + ("owners", eroot, eroot + "usr"),
277	emerge_cmd + ("-p", eroot + "usr"),	277	#~ emerge_cmd + ("-p", eroot + "usr"),
278	emerge_cmd + ("-p", "--unmerge", "-q", eroot + "usr"),	278	#~ emerge_cmd + ("-p", "--unmerge", "-q", eroot + "usr"),
279	emerge_cmd + ("--unmerge", "--quiet", "dev-libs/A"),	279	#~ emerge_cmd + ("--unmerge", "--quiet", "dev-libs/A"),
280	emerge_cmd + ("-C", "--quiet", "dev-libs/B"),	280	#~ emerge_cmd + ("-C", "--quiet", "dev-libs/B"),
281		281
282	# Test cross-prefix usage, including chpathtool for binpkgs.	282	# Test cross-prefix usage, including chpathtool for binpkgs.
283	({"EPREFIX" : cross_prefix},) + \	283	({"EPREFIX" : cross_prefix},) + \
284	emerge_cmd + ("--usepkgonly", "dev-libs/A"),	284	emerge_cmd + ("--usepkgonly", "dev-libs/A"),
285	({"EPREFIX" : cross_prefix},) + \	285	#({"EPREFIX" : cross_prefix},) + \
286	portageq_cmd + ("has_version", cross_prefix, "dev-libs/A"),	286	# portageq_cmd + ("has_version", cross_prefix, "dev-libs/A"),
287	({"EPREFIX" : cross_prefix},) + \	287	#({"EPREFIX" : cross_prefix},) + \
288	portageq_cmd + ("has_version", cross_prefix, "dev-libs/B"),	288	# portageq_cmd + ("has_version", cross_prefix, "dev-libs/B"),
289	({"EPREFIX" : cross_prefix},) + \	289	#({"EPREFIX" : cross_prefix},) + \
290	emerge_cmd + ("-C", "--quiet", "dev-libs/B"),	290	# emerge_cmd + ("-C", "--quiet", "dev-libs/B"),
291	({"EPREFIX" : cross_prefix},) + \	291	#({"EPREFIX" : cross_prefix},) + \
292	emerge_cmd + ("-C", "--quiet", "dev-libs/A"),	292	# emerge_cmd + ("-C", "--quiet", "dev-libs/A"),
293	({"EPREFIX" : cross_prefix},) + \	293	#({"EPREFIX" : cross_prefix},) + \
294	emerge_cmd + ("dev-libs/A",),	294	# emerge_cmd + ("dev-libs/A",),
295	({"EPREFIX" : cross_prefix},) + \	295	#({"EPREFIX" : cross_prefix},) + \
296	portageq_cmd + ("has_version", cross_prefix, "dev-libs/A"),	296	# portageq_cmd + ("has_version", cross_prefix, "dev-libs/A"),
297	({"EPREFIX" : cross_prefix},) + \	297	#({"EPREFIX" : cross_prefix},) + \
298	portageq_cmd + ("has_version", cross_prefix, "dev-libs/B"),	298	# portageq_cmd + ("has_version", cross_prefix, "dev-libs/B"),
299	)	299	)
300		300
301	distdir = playground.distdir	301	distdir = playground.distdir
Lines 304-309 pkg_preinst() { Link Here
304	portage_tmpdir = os.path.join(eprefix, "var", "tmp", "portage")	304	portage_tmpdir = os.path.join(eprefix, "var", "tmp", "portage")
305	profile_path = settings.profile_path	305	profile_path = settings.profile_path
306	user_config_dir = os.path.join(os.sep, eprefix, USER_CONFIG_PATH)	306	user_config_dir = os.path.join(os.sep, eprefix, USER_CONFIG_PATH)
		307	cross_prefix_user_config_dir = os.path.join(cross_prefix, USER_CONFIG_PATH)
307		308
308	path = os.environ.get("PATH")	309	path = os.environ.get("PATH")
309	if path is not None and not path.strip():	310	if path is not None and not path.strip():
Lines 350-357 pkg_preinst() { Link Here
350	os.environ["__PORTAGE_TEST_HARDLINK_LOCKS"]	351	os.environ["__PORTAGE_TEST_HARDLINK_LOCKS"]
351		352
352	updates_dir = os.path.join(test_repo_location, "profiles", "updates")	353	updates_dir = os.path.join(test_repo_location, "profiles", "updates")
353	dirs = [cachedir, cachedir_pregen, distdir, fake_bin,	354	dirs = [cachedir, cachedir_pregen, cross_prefix, cross_prefix_user_config_dir,
354	portage_tmpdir, updates_dir,	355	distdir, fake_bin, portage_tmpdir, updates_dir,
355	user_config_dir, var_cache_edb]	356	user_config_dir, var_cache_edb]
356	etc_symlinks = ("dispatch-conf.conf", "etc-update.conf")	357	etc_symlinks = ("dispatch-conf.conf", "etc-update.conf")
357	# Override things that may be unavailable, or may have portability	358	# Override things that may be unavailable, or may have portability
Lines 382-387 pkg_preinst() { Link Here
382	slotmove =app-doc/pms-3 2 3	383	slotmove =app-doc/pms-3 2 3
383	move dev-util/git dev-vcs/git	384	move dev-util/git dev-vcs/git
384	""")	385	""")
		386	os.symlink(os.path.join(test_repo_location, "profiles", "default", "linux",
		387	"x86", "test_profile"), os.path.join(cross_prefix, "etc", "portage", "make.profile"))
385		388
386	if debug:	389	if debug:
387	# The subprocess inherits both stdout and stderr, for	390	# The subprocess inherits both stdout and stderr, for
Lines 417-420 move dev-util/git dev-vcs/git Link Here
417	self.assertEqual(os.EX_OK, proc.returncode,	420	self.assertEqual(os.EX_OK, proc.returncode,
418	"emerge failed with args %s" % (args,))	421	"emerge failed with args %s" % (args,))
419	finally:	422	finally:
420	playground.cleanup()	423	#playground.cleanup()
		424	pass
421	-