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 666AB59CB2 for ; Sun, 17 Apr 2016 08:07:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30B4B21C1E7; Sun, 17 Apr 2016 08:06:47 +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 DC10421C1E6 for ; Sun, 17 Apr 2016 08:06:40 +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 1F133340B27; Sun, 17 Apr 2016 08:06:38 +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 4/4] tests: Include metadata.xsd for repoman tests Date: Sun, 17 Apr 2016 10:06:29 +0200 Message-Id: <1460880389-13222-5-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: c2de9380-407a-4d00-ab1e-2307e597cb48 X-Archives-Hash: cc77937e8b3362139bdede075c3700a1 --- .travis.yml | 4 +- MANIFEST.in | 2 +- cnf/metadata.dtd | 102 ------ cnf/metadata.xsd | 547 +++++++++++++++++++++++++++++++ pym/portage/tests/repoman/test_simple.py | 8 +- 5 files changed, 554 insertions(+), 109 deletions(-) delete mode 100644 cnf/metadata.dtd create mode 100644 cnf/metadata.xsd diff --git a/.travis.yml b/.travis.yml index b662d94..5213fee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ python: script: - ./setup.py test - ./setup.py install --root=/tmp/install-root - # prevent repoman tests from trying to fetch metadata.dtd + # prevent repoman tests from trying to fetch metadata.xsd - mkdir -p /tmp/install-root/usr/lib/portage/cnf - - cp cnf/metadata.dtd /tmp/install-root/usr/lib/portage/cnf/ + - cp cnf/metadata.xsd /tmp/install-root/usr/lib/portage/cnf/ - sudo rsync -a /tmp/install-root/. / - python -b -Wd -m portage.tests.runTests diff --git a/MANIFEST.in b/MANIFEST.in index d65c874..2178460 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -12,7 +12,7 @@ include cnf/make.conf.example.* # extra files for tests include .portage_not_installed -include cnf/metadata.dtd +include cnf/metadata.xsd # extra scripts include misc/* diff --git a/cnf/metadata.dtd b/cnf/metadata.dtd deleted file mode 100644 index ff2649c..0000000 --- a/cnf/metadata.dtd +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cnf/metadata.xsd b/cnf/metadata.xsd new file mode 100644 index 0000000..0ead09e --- /dev/null +++ b/cnf/metadata.xsd @@ -0,0 +1,547 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pym/portage/tests/repoman/test_simple.py b/pym/portage/tests/repoman/test_simple.py index 720560b..6a79761 100644 --- a/pym/portage/tests/repoman/test_simple.py +++ b/pym/portage/tests/repoman/test_simple.py @@ -128,7 +128,7 @@ class SimpleRepomanTestCase(TestCase): } licenses = ["GPL-2"] arch_list = ["x86"] - metadata_dtd = os.path.join(PORTAGE_BASE_PATH, "cnf/metadata.dtd") + metadata_xsd = os.path.join(PORTAGE_BASE_PATH, "cnf/metadata.xsd") metadata_xml_files = ( ( "dev-libs/A", @@ -269,9 +269,9 @@ class SimpleRepomanTestCase(TestCase): # involving canonical vs. non-canonical paths. test_repo_symlink = os.path.join(eroot, "test_repo_symlink") os.symlink(test_repo_location, test_repo_symlink) - metadata_dtd_dest = os.path.join(test_repo_location, 'metadata/dtd/metadata.dtd') - os.makedirs(os.path.dirname(metadata_dtd_dest)) - os.symlink(metadata_dtd, metadata_dtd_dest) + metadata_xsd_dest = os.path.join(test_repo_location, 'metadata/xml-schema/metadata.xsd') + os.makedirs(os.path.dirname(metadata_xsd_dest)) + os.symlink(metadata_xsd, metadata_xsd_dest) if debug: # The subprocess inherits both stdout and stderr, for -- 2.8.1