From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QWP39-0006a9-EX for garchives@archives.gentoo.org; Tue, 14 Jun 2011 08:32:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ACFDE1C045; Tue, 14 Jun 2011 08:32:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7E7901C042 for ; Tue, 14 Jun 2011 08:32:17 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F06B91B4015 for ; Tue, 14 Jun 2011 08:32:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2C48380040 for ; Tue, 14 Jun 2011 08:32:16 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: Subject: [gentoo-commits] proj/pms-test-suite:master commit in: PMSTestSuite/library/standard/, PMSTestSuite/library/standard/basic/ X-VCS-Repository: proj/pms-test-suite X-VCS-Files: PMSTestSuite/library/standard/basic/phase_function_order.py PMSTestSuite/library/standard/dbus_case.py X-VCS-Directories: PMSTestSuite/library/standard/ PMSTestSuite/library/standard/basic/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: df419b8f8eccc77bab0eb83b379d78f76e9d814f Date: Tue, 14 Jun 2011 08:32:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 6a78447dd857eff2ff65fc1a0f2ba854 commit: df419b8f8eccc77bab0eb83b379d78f76e9d814f Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Tue Jun 14 07:27:14 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Tue Jun 14 07:28:02 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/pms-test-suit= e.git;a=3Dcommit;h=3Ddf419b8f Use _finalize() to ensure pms-test-dbus_pkg_setup() is called. --- .../library/standard/basic/phase_function_order.py | 1 - PMSTestSuite/library/standard/dbus_case.py | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/PMSTestSuite/library/standard/basic/phase_function_order.py = b/PMSTestSuite/library/standard/basic/phase_function_order.py index 82889ca..cf4dd0a 100644 --- a/PMSTestSuite/library/standard/basic/phase_function_order.py +++ b/PMSTestSuite/library/standard/basic/phase_function_order.py @@ -13,7 +13,6 @@ class PhaseFunctionOrderTest(DBusEbuildTestCase): } =20 phase_funcs =3D dict([(x, [ - "pms-test-dbus_pkg_setup" if x =3D=3D 'pkg_setup' else "", "pms-test-dbus_append_result %s" % x ]) for x in phase_func_names]) =20 diff --git a/PMSTestSuite/library/standard/dbus_case.py b/PMSTestSuite/li= brary/standard/dbus_case.py index 977d6da..53991ba 100644 --- a/PMSTestSuite/library/standard/dbus_case.py +++ b/PMSTestSuite/library/standard/dbus_case.py @@ -33,7 +33,6 @@ pms-test-dbus_call() { } =20 pms-test-dbus_pkg_setup() { - # XXX: only for dbus cases pms-test-dbus_call test_started } =20 @@ -84,6 +83,11 @@ class DBusEbuildTestCase(EbuildTestCase): EbuildTestCase.__init__(self, *args, **kwargs) self._dbusobj =3D RunningTest(self) =20 + def _finalize(self): + """ Finalize the object, ensuring pkg_setup() will be called. """ + if self.phase_funcs['pkg_setup']: + self.phase_funcs['pkg_setup'].insert(0, 'pms-test-dbus_pkg_setup') + def check_dbus_result(self, output, merged): """ Check whether the sent through D-Bus matches expected test