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, 26 Sep 2011 19:42:15
Message-Id: e20dcd3e3c6f0bbe8c3d51bca35080d5a987c42f.zmedico@gentoo
1 commit: e20dcd3e3c6f0bbe8c3d51bca35080d5a987c42f
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 26 19:41:53 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 26 19:41:53 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e20dcd3e
7
8 tests/emerge: call ebuild(1)
9
10 ---
11 pym/portage/tests/emerge/test_simple.py | 9 +++++++++
12 1 files changed, 9 insertions(+), 0 deletions(-)
13
14 diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py
15 index 6810d05..134d889 100644
16 --- a/pym/portage/tests/emerge/test_simple.py
17 +++ b/pym/portage/tests/emerge/test_simple.py
18 @@ -123,8 +123,13 @@ src_install() {
19 settings = playground.settings
20 eprefix = settings["EPREFIX"]
21 eroot = settings["EROOT"]
22 + trees = playground.trees
23 + root = playground.root
24 + portdb = trees[root]["porttree"].dbapi
25
26 portage_python = portage._python_interpreter
27 + ebuild_cmd = (portage_python, "-Wd",
28 + os.path.join(PORTAGE_BIN_PATH, "ebuild"))
29 egencache_cmd = (portage_python, "-Wd",
30 os.path.join(PORTAGE_BIN_PATH, "egencache"))
31 emerge_cmd = (portage_python, "-Wd",
32 @@ -146,6 +151,9 @@ src_install() {
33 if self._have_python_xml():
34 egencache_extra_args.append("--update-use-local-desc")
35
36 + test_ebuild = portdb.findname("dev-libs/A-1")
37 + self.assertFalse(test_ebuild is None)
38 +
39 test_commands = (
40 env_update_cmd,
41 egencache_cmd + ("--update",) + tuple(egencache_extra_args),
42 @@ -153,6 +161,7 @@ src_install() {
43 emerge_cmd + ("--info",),
44 emerge_cmd + ("--info", "--verbose"),
45 emerge_cmd + ("--pretend", "dev-libs/A"),
46 + ebuild_cmd + (test_ebuild, "manifest", "clean", "package", "merge"),
47 emerge_cmd + ("--pretend", "--tree", "--complete-graph", "dev-libs/A"),
48 emerge_cmd + ("-p", "dev-libs/B"),
49 emerge_cmd + ("-B", "dev-libs/B",),