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 D8E9659CB2 for ; Sun, 17 Apr 2016 08:06:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DCF1821C06D; Sun, 17 Apr 2016 08:06:37 +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 1E88521C004 for ; Sun, 17 Apr 2016 08:06:37 +0000 (UTC) Received: from localhost.localdomain (d202-252.icpnet.pl [109.173.202.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 8D6DE340B27; Sun, 17 Apr 2016 08:06:35 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-portage-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-portage-dev] [PATCH 1/4] tests: Stop using herds Date: Sun, 17 Apr 2016 10:06:26 +0200 Message-Id: <1460880389-13222-2-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1460880389-13222-1-git-send-email-mgorny@gentoo.org> References: <1460880389-13222-1-git-send-email-mgorny@gentoo.org> 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: 77b17271-ce90-44c4-8d19-6fbb3c2ed09a X-Archives-Hash: 30a2f77feb96088487585e1ad63fc720 --- pym/portage/tests/emerge/test_simple.py | 2 -- pym/portage/tests/repoman/test_simple.py | 3 --- pym/portage/tests/resolver/ResolverPlayground.py | 22 ---------------------- 3 files changed, 27 deletions(-) diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py index 394ed43..e5ecd4b 100644 --- a/pym/portage/tests/emerge/test_simple.py +++ b/pym/portage/tests/emerge/test_simple.py @@ -153,14 +153,12 @@ pkg_preinst() { ( "dev-libs/A", { - "herd" : "base-system", "flags" : "Description of how USE='flag' affects this package", }, ), ( "dev-libs/B", { - "herd" : "no-herd", "flags" : "Description of how USE='flag' affects this package", }, ), diff --git a/pym/portage/tests/repoman/test_simple.py b/pym/portage/tests/repoman/test_simple.py index 98220c4..720560b 100644 --- a/pym/portage/tests/repoman/test_simple.py +++ b/pym/portage/tests/repoman/test_simple.py @@ -133,21 +133,18 @@ class SimpleRepomanTestCase(TestCase): ( "dev-libs/A", { - "herd" : "base-system", "flags" : "Description of how USE='flag' affects this package", }, ), ( "dev-libs/B", { - "herd" : "no-herd", "flags" : "Description of how USE='flag' affects this package", }, ), ( "dev-libs/C", { - "herd" : "no-herd", "flags" : "Description of how USE='flag' affects this package", }, ), diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py index 6bdf2c7..68e047a 100644 --- a/pym/portage/tests/resolver/ResolverPlayground.py +++ b/pym/portage/tests/resolver/ResolverPlayground.py @@ -47,7 +47,6 @@ class ResolverPlayground(object): metadata_xml_template = """ -%(herd)s maintainer-needed@gentoo.org Description of the maintainership @@ -381,27 +380,6 @@ class ResolverPlayground(object): #Create profile symlink os.symlink(sub_profile_dir, os.path.join(user_config_dir, "make.profile")) - #Create minimal herds.xml - herds_xml = """ - - - - - - base-system - base-system@gentoo.org - Core system utilities and libraries. - - base-system@gentoo.orgg - Base System - Base System Maintainer - - - -""" - with open(os.path.join(metadata_dir, "metadata.xml"), 'w') as f: - f.write(herds_xml) - make_conf = { "ACCEPT_KEYWORDS": "x86", "CLEAN_DELAY": "0", -- 2.8.1