Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/emerge/
Date: Mon, 05 Sep 2011 23:07:08
Message-Id: b2607fa29ce49e08b4957babce1fb1204ca5a1ad.zmedico@gentoo
1 commit: b2607fa29ce49e08b4957babce1fb1204ca5a1ad
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 5 23:06:44 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 5 23:06:44 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b2607fa2
7
8 tests/emerge: test portageq
9
10 ---
11 pym/portage/tests/emerge/test_simple.py | 19 ++++++++++++++++---
12 1 files changed, 16 insertions(+), 3 deletions(-)
13
14 diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py
15 index 3f7a3be..62cb46c 100644
16 --- a/pym/portage/tests/emerge/test_simple.py
17 +++ b/pym/portage/tests/emerge/test_simple.py
18 @@ -118,6 +118,12 @@ src_install() {
19 ),
20 )
21
22 + playground = ResolverPlayground(
23 + ebuilds=ebuilds, installed=installed, debug=debug)
24 + settings = playground.settings
25 + eprefix = settings["EPREFIX"]
26 + eroot = settings["EROOT"]
27 +
28 portage_python = portage._python_interpreter
29 egencache_cmd = (portage_python, "-Wd",
30 os.path.join(PORTAGE_BIN_PATH, "egencache"))
31 @@ -125,6 +131,8 @@ src_install() {
32 os.path.join(PORTAGE_BIN_PATH, "emerge"))
33 emaint_cmd = (portage_python, "-Wd",
34 os.path.join(PORTAGE_BIN_PATH, "emaint"))
35 + portageq_cmd = (portage_python, "-Wd",
36 + os.path.join(PORTAGE_BIN_PATH, "portageq"))
37 quickpkg_cmd = (portage_python, "-Wd",
38 os.path.join(PORTAGE_BIN_PATH, "quickpkg"))
39
40 @@ -151,13 +159,18 @@ src_install() {
41 emerge_cmd + ("--usepkgonly", "dev-libs/A"),
42 emaint_cmd + ("--check", "all"),
43 emaint_cmd + ("--fix", "all"),
44 + portageq_cmd + ("match", "/", "dev-libs/A"),
45 + portageq_cmd + ("best_visible", "/", "dev-libs/A"),
46 + portageq_cmd + ("best_visible", "/", "binary", "dev-libs/A"),
47 + portageq_cmd + ("contents", "/", "dev-libs/A-1"),
48 + portageq_cmd + ("metadata", "/", "ebuild", "dev-libs/A-1", "EAPI", "IUSE", "RDEPEND"),
49 + portageq_cmd + ("metadata", "/", "binary", "dev-libs/A-1", "EAPI", "USE", "RDEPEND"),
50 + portageq_cmd + ("metadata", "/", "installed", "dev-libs/A-1", "EAPI", "USE", "RDEPEND"),
51 + portageq_cmd + ("owners", "/", eroot + "usr"),
52 emerge_cmd + ("--unmerge", "--quiet", "dev-libs/A"),
53 emerge_cmd + ("-C", "--quiet", "dev-libs/B"),
54 )
55
56 - playground = ResolverPlayground(ebuilds=ebuilds, installed=installed)
57 - settings = playground.settings
58 - eprefix = settings["EPREFIX"]
59 distdir = os.path.join(eprefix, "distdir")
60 pkgdir = os.path.join(eprefix, "pkgdir")
61 fake_bin = os.path.join(eprefix, "bin")