From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D588A59CA5 for ; Sat, 19 Mar 2016 21:29:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 145D521C03C; Sat, 19 Mar 2016 21:29:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A76421C03C for ; Sat, 19 Mar 2016 21:29:38 +0000 (UTC) Received: from sf.home (host81-147-14-156.range81-147.btcentralplus.com [81.147.14.156]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: slyfox) by smtp.gentoo.org (Postfix) with ESMTPSA id 2723F3406F2; Sat, 19 Mar 2016 21:29:37 +0000 (UTC) Received: by sf.home (Postfix, from userid 1000) id 2218B17BCEB16; Sat, 19 Mar 2016 21:29:34 +0000 (GMT) From: Sergei Trofimovich To: gentoo-portage-dev@lists.gentoo.org Cc: Sergei Trofimovich Subject: [gentoo-portage-dev] [PATCH 2/2] runtests: fix output for skipped pythons Date: Sat, 19 Mar 2016 21:29:32 +0000 Message-Id: <1458422972-22690-1-git-send-email-slyfox@gentoo.org> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Archives-Salt: eaefe0aa-e343-4537-b7dc-dfd8e9838efc X-Archives-Hash: f0ae7bcb366e474ea912e96c8d626205 From: Sergei Trofimovich I have Pythons 2.7 and 3.4 installed. Before the patch I had the following output: $ ./runtests pym/portage/tests/resolver/test_blocker.py Testing with Python 2.7... Testing with Python 3.4... Summary: | Version | Status |-------------------- | 2.7 | PASS | 3.3 | PASS After the patch: $ ./runtests pym/portage/tests/resolver/test_blocker.py Testing with Python 2.7... Skip Python 3.3... Testing with Python 3.4... Skip Python pypy... Skip Python 3.5... Summary: | Version | Status |-------------------- | 2.7 | PASS | 3.4 | PASS Signed-off-by: Sergei Trofimovich --- runtests | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/runtests b/runtests index d492bc8..9135768 100755 --- a/runtests +++ b/runtests @@ -42,7 +42,7 @@ class Colors(object): _COLORS_YES = ('y', 'yes', 'true') _COLORS_NO = ('n', 'no', 'false') - GOOD = BAD = NORMAL = '' + WARN = GOOD = BAD = NORMAL = '' def __init__(self, colorize=None): if colorize is None: @@ -63,6 +63,7 @@ class Colors(object): raise ValueError('--colors is invalid: %s' % colorize) if colorize: + self.WARN = '\033[1;33m' self.GOOD = '\033[1;32m' self.BAD = '\033[1;31m' self.NORMAL = '\033[0m' @@ -135,11 +136,14 @@ def main(argv): if os.access(prog, os.X_OK): print('%sTesting with Python %s...%s' % (colors.GOOD, ver, colors.NORMAL)) - statuses.append(subprocess.call(cmd)) + statuses.append((ver, subprocess.call(cmd))) elif not ignore_missing: print('%sCould not find requested Python %s%s' % (colors.BAD, ver, colors.NORMAL)) - statuses.append(1) + statuses.append((ver, 1)) + else: + print('%sSkip Python %s...%s' % + (colors.WARN, ver, colors.NORMAL)) print() finally: if tempdir is not None: @@ -154,7 +158,9 @@ def main(argv): width = 10 header = '| %-*s | %s' % (width, 'Version', 'Status') print('%s\n|%s' % (header, '-' * (len(header) - 1))) - for ver, status in zip(pyversions, statuses): + exit_status = 0 + for ver, status in statuses: + exit_status += status if status: color = colors.BAD msg = 'FAIL' @@ -163,7 +169,7 @@ def main(argv): msg = 'PASS' print('| %s%-*s%s | %s%s%s' % (color, width, ver, colors.NORMAL, color, msg, colors.NORMAL)) - exit(sum(statuses)) + exit(exit_status) if __name__ == '__main__': -- 2.7.4