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 80B35138206 for ; Mon, 25 Apr 2016 15:07:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD5C5E07F1; Mon, 25 Apr 2016 15:07:48 +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 3EB61E0825 for ; Mon, 25 Apr 2016 15:07:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2D173340967 for ; Mon, 25 Apr 2016 15:07:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B1B4597C for ; Mon, 25 Apr 2016 15:07:44 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1461596635.e34f44b2d66f2fcd830457adc5d5b9e6f90796db.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/portage/tests/repoman/, /, cnf/ X-VCS-Repository: proj/portage X-VCS-Files: .travis.yml MANIFEST.in cnf/metadata.dtd cnf/metadata.xsd pym/portage/tests/repoman/test_simple.py X-VCS-Directories: pym/portage/tests/repoman/ / cnf/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: e34f44b2d66f2fcd830457adc5d5b9e6f90796db X-VCS-Branch: repoman Date: Mon, 25 Apr 2016 15:07:44 +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: 7e540bf8-8057-4350-ad17-ca02450033bb X-Archives-Hash: 3f0a8a5d1479a55315b31dc741050368 commit: e34f44b2d66f2fcd830457adc5d5b9e6f90796db Author: Michał Górny gentoo org> AuthorDate: Sun Apr 17 08:06:29 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Mon Apr 25 15:03:55 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e34f44b2 tests: Include metadata.xsd for repoman tests .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(-) 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