From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 06D4F1382C5 for ; Mon, 26 Feb 2018 22:07:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56DC3E0923; Mon, 26 Feb 2018 22:07:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 31DBAE0923 for ; Mon, 26 Feb 2018 22:07:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 573CF335C06 for ; Mon, 26 Feb 2018 22:07:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD8741E8 for ; Mon, 26 Feb 2018 22:07:52 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1519682856.45bdfae8b20dc24559d325db7322576855d6a582.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/resolver/test_required_use.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 45bdfae8b20dc24559d325db7322576855d6a582 X-VCS-Branch: master Date: Mon, 26 Feb 2018 22:07:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a5fa5249-92fb-471f-829a-4e5d5d04cd66 X-Archives-Hash: 06db4185065a058fd9589217b615446b commit: 45bdfae8b20dc24559d325db7322576855d6a582 Author: Michał Górny gentoo org> AuthorDate: Mon Feb 26 12:40:15 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Feb 26 22:07:36 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=45bdfae8 test_required_use: Add tests for ?? operator Reviewed-by: Zac Medico gentoo.org> pym/portage/tests/resolver/test_required_use.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pym/portage/tests/resolver/test_required_use.py b/pym/portage/tests/resolver/test_required_use.py index c8810faef..d40222204 100644 --- a/pym/portage/tests/resolver/test_required_use.py +++ b/pym/portage/tests/resolver/test_required_use.py @@ -44,6 +44,12 @@ class RequiredUSETestCase(TestCase): "dev-libs/D-3" : {"EAPI": "4", "IUSE": "+w +x y z", "REQUIRED_USE": "w? ( x || ( y z ) )"}, "dev-libs/D-4" : {"EAPI": "4", "IUSE": "+w x +y +z", "REQUIRED_USE": "w? ( x || ( y z ) )"}, "dev-libs/D-5" : {"EAPI": "4", "IUSE": "w x y z", "REQUIRED_USE": "w? ( x || ( y z ) )"}, + + "dev-libs/E-1" : {"EAPI": "5", "IUSE": "foo bar", "REQUIRED_USE": "?? ( foo bar )"}, + "dev-libs/E-2" : {"EAPI": "5", "IUSE": "foo +bar", "REQUIRED_USE": "?? ( foo bar )"}, + "dev-libs/E-3" : {"EAPI": "5", "IUSE": "+foo bar", "REQUIRED_USE": "?? ( foo bar )"}, + "dev-libs/E-4" : {"EAPI": "5", "IUSE": "+foo +bar", "REQUIRED_USE": "?? ( foo bar )"}, + "dev-libs/E-5" : {"EAPI": "5", "IUSE": "+foo +bar", "REQUIRED_USE": "?? ( )"}, } test_cases = ( @@ -79,6 +85,12 @@ class RequiredUSETestCase(TestCase): ResolverPlaygroundTestCase(["=dev-libs/D-3"], success = False), ResolverPlaygroundTestCase(["=dev-libs/D-4"], success = False), ResolverPlaygroundTestCase(["=dev-libs/D-5"], success = True, mergelist=["dev-libs/D-5"]), + + ResolverPlaygroundTestCase(["=dev-libs/E-1"], success = True, mergelist=["dev-libs/E-1"]), + ResolverPlaygroundTestCase(["=dev-libs/E-2"], success = True, mergelist=["dev-libs/E-2"]), + ResolverPlaygroundTestCase(["=dev-libs/E-3"], success = True, mergelist=["dev-libs/E-3"]), + ResolverPlaygroundTestCase(["=dev-libs/E-4"], success = False), + ResolverPlaygroundTestCase(["=dev-libs/E-5"], success = True, mergelist=["dev-libs/E-5"]), ) playground = ResolverPlayground(ebuilds=ebuilds)