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 1QXIZO-0006rz-Ps for garchives@archives.gentoo.org; Thu, 16 Jun 2011 19:49:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0D331C0C6; Thu, 16 Jun 2011 19:49:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 81B7E1C0C6 for ; Thu, 16 Jun 2011 19:49:16 +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 0D3B91B4038 for ; Thu, 16 Jun 2011 19:49:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 19FEF8004F for ; Thu, 16 Jun 2011 19:49:15 +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/ X-VCS-Repository: proj/pms-test-suite X-VCS-Files: PMSTestSuite/cli.py X-VCS-Directories: PMSTestSuite/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e1a498ae05cda905b24fdddd47d510ebc4c952cf Date: Thu, 16 Jun 2011 19:49:15 +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: be9952100d2e92162bdb9afe0374413e commit: e1a498ae05cda905b24fdddd47d510ebc4c952cf Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Thu Jun 16 19:32:07 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Thu Jun 16 19:32:07 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/pms-test-suit= e.git;a=3Dcommit;h=3De1a498ae Use only public test API in CLI. --- PMSTestSuite/cli.py | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/PMSTestSuite/cli.py b/PMSTestSuite/cli.py index 3573c85..d031a4c 100644 --- a/PMSTestSuite/cli.py +++ b/PMSTestSuite/cli.py @@ -112,8 +112,7 @@ class PMSTestSuiteCLI(object): self.failed.append(t) t.clean(self.pm) =20 - self.merged_pkgs =3D frozenset(self.pm.lookup_vardb(self.cpvs)) - if self.merged_pkgs: + if self.pm.has_pending_actions: print('-> Unmerging test ebuilds...') self.pm.commit(self.all_done) else: @@ -121,11 +120,11 @@ class PMSTestSuiteCLI(object): =20 def all_done(self): if not self.failed: - print('%d tests completed successfully.' % len(self.cpvs)) + print('%d tests completed successfully.' % len(self.test_library)) else: print('%d of %d tests completed successfully, %d failed:' - % (len(self.cpvs) - len(self.failed), - len(self.cpvs), len(self.failed))) + % (len(self.test_library) - len(self.failed), + len(self.test_library), len(self.failed))) for t in self.failed: print('- %s' % t.p) =20 @@ -139,8 +138,9 @@ class PMSTestSuiteCLI(object): self.pm.commit(self.tests_done) =20 def pre_unmerge_done(self): - installedcpvs =3D self.pm.lookup_vardb(self.cpvs) - if installedcpvs: + for t in self.test_library: + t.clean(self.pm) + if self.pm.has_pending_actions: print('Failed to unmerge the following test ebuilds:') print(' '.join(installedcpvs)) print('Refusing to proceed.') @@ -161,14 +161,10 @@ class PMSTestSuiteCLI(object): self.repository.write_files(files) self.repository.remanifest(files, self.pm) =20 - self.cpvs =3D [t.cpv for t in self.test_library] - - self.package_queue =3D list(self.cpvs) for t in self.test_library: t.clean(self.pm) =20 - installedcpvs =3D self.pm.lookup_vardb(self.cpvs) - if installedcpvs: + if self.pm.has_pending_actions: print('-> Unmerging already-merged test ebuilds...') self.pm.commit(self.pre_unmerge_done) else: