Return-Path: X-Original-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C95B59CA5 for ; Wed, 7 Mar 2012 23:23:35 +0000 (UTC) Received: (qmail 58588 invoked by uid 500); 7 Mar 2012 23:23:35 -0000 Delivered-To: apmail-incubator-bigtop-commits-archive@incubator.apache.org Received: (qmail 58545 invoked by uid 500); 7 Mar 2012 23:23:35 -0000 Mailing-List: contact bigtop-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@incubator.apache.org Delivered-To: mailing list bigtop-commits@incubator.apache.org Received: (qmail 58534 invoked by uid 99); 7 Mar 2012 23:23:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Mar 2012 23:23:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Mar 2012 23:23:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5097F2388847; Wed, 7 Mar 2012 23:22:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1298204 [1/36] - in /incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package: ./ src/main/groovy/org/apache/bigtop/itest/packagesmoke/ src/main/resources/ src/main/resources/apt/ src/main/resources/urpmi/ src/main/resourc... Date: Wed, 07 Mar 2012 23:22:44 -0000 To: bigtop-commits@incubator.apache.org From: rvs@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120307232251.5097F2388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rvs Date: Wed Mar 7 23:22:40 2012 New Revision: 1298204 URL: http://svn.apache.org/viewvc?rev=1298204&view=rev Log: BIGTOP-402. manifests for package testing contain way too many duplicate data Added: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/bigtop-utils.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/flume-master.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/flume-node.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/flume.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-conf-pseudo.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-doc.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs-datanode.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs-namenode.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs-secondarynamenode.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-httpfs.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-mapreduce-historyserver.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-mapreduce.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-yarn-nodemanager.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-yarn-proxyserver.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-yarn-resourcemanager.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-yarn.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hbase-doc.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hbase-master.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hbase-regionserver.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hbase-thrift.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hbase.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hive-metastore.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hive-server.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hive.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/libhdfs0-dev.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/libhdfs0.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/mahout.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/oozie-client.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/oozie.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/pig.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/sqoop-metastore.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/sqoop.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/whirr.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/zookeeper-server.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/zookeeper.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/package_data.xml - copied, changed from r1297315, incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_urpmi.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/bigtop-utils.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/flume-master.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/flume-node.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/flume.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-conf-pseudo.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-debuginfo.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-doc.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-hdfs-datanode.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-hdfs-namenode.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-hdfs-secondarynamenode.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-hdfs.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-httpfs.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-libhdfs.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-mapreduce-historyserver.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-mapreduce.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-yarn-nodemanager.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-yarn-proxyserver.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-yarn-resourcemanager.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-yarn.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase-doc.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase-master.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase-regionserver.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase-thrift.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hive-metastore.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hive-server.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/hive.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/mahout.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/oozie-client.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/oozie.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/pig.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/sqoop-metastore.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/sqoop.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/whirr.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/zookeeper-server.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/yum/zookeeper.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/bigtop-utils.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/flume-master.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/flume-node.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/flume.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-conf-pseudo.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-doc.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-hdfs-datanode.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-hdfs-namenode.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-hdfs-secondarynamenode.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-hdfs.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-httpfs.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-libhdfs.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-mapreduce-historyserver.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-mapreduce.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-yarn-nodemanager.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-yarn-proxyserver.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-yarn-resourcemanager.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-yarn.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase-doc.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase-master.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase-regionserver.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase-thrift.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hive-metastore.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hive-server.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hive.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/mahout.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/oozie-client.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/oozie.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/pig.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/sqoop-metastore.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/sqoop.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/whirr.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/zookeeper-server.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/zypper/zookeeper.xml Removed: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_apt.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_urpmi.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/package_data_zypper.xml Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/pom.xml incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesBasics.groovy Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/pom.xml?rev=1298204&r1=1298203&r2=1298204&view=diff ============================================================================== --- incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/pom.xml (original) +++ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/pom.xml Wed Mar 7 23:22:40 2012 @@ -66,8 +66,8 @@ Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy?rev=1298204&r1=1298203&r2=1298204&view=diff ============================================================================== --- incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy (original) +++ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy Wed Mar 7 23:22:40 2012 @@ -374,20 +374,22 @@ class PackageTestCommon { problemFiles, equalTo([])); // a bit of debug output - def newManifest = new MarkupBuilder(new FileWriter("${pkg.name}_manifest.xml")); + def newManifest = new MarkupBuilder(new FileWriter("${pkg.name}.xml")); - newManifest.content() { - fileMeta = getLsMetadata(pkg.getFiles()); - - pkg.getFiles().each { - Map meta = fileMeta[it] ?: [:]; - String node = configs[it] ? "config" : (docs[it] ? "doc " : "file"); - int owners = meta.owners ?: -1; - - if (meta.target) { - "$node"(name : it, owners : owners, perm : meta.perm, user : meta.user, group : meta.group, target : meta.target); - } else { - "$node"(name : it, owners : owners, perm : meta.perm, user : meta.user, group : meta.group); + newManifest."${pkg.name}" { + content { + fileMeta = getLsMetadata(pkg.getFiles()); + + pkg.getFiles().each { + Map meta = fileMeta[it] ?: [:]; + String node = configs[it] ? "config" : (docs[it] ? "doc " : "file"); + int owners = meta.owners ?: -1; + + if (meta.target) { + "$node"(name : it, owners : owners, perm : meta.perm, user : meta.user, group : meta.group, target : meta.target); + } else { + "$node"(name : it, owners : owners, perm : meta.perm, user : meta.user, group : meta.group); + } } } } Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesBasics.groovy URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesBasics.groovy?rev=1298204&r1=1298203&r2=1298204&view=diff ============================================================================== --- incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesBasics.groovy (original) +++ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesBasics.groovy Wed Mar 7 23:22:40 2012 @@ -69,13 +69,40 @@ class TestPackagesBasics extends Package repo.removeRepo(); } + + private static void mergeTreeIntoForrest(NodeList forrest, Node tree) { + for (it in forrest) { + if (it instanceof Node && it.name() == tree.name()) { + tree.value().groupBy({(it instanceof Node)?it.name():"-$it"}).each { k,v -> + if (v.size() == 1 && v.get(0) instanceof Node) { + mergeTreeIntoForrest(it.value(), v.get(0)); + } else if (v.size() != 1) { + it.value().addAll(v); + } + } + return; + } + } + forrest.add(tree); + } + + private static Node mergeTrees(Node n1, Node n2) { + Node merge = new Node(null, "merge"); + merge.append(n1); + mergeTreeIntoForrest(merge.value(), n2); + return (merge.children().size() == 1) ? merge.children().get(0) : + merge; + } + @Parameters public static Map generateTests() { String type = TestPackagesBasics.pm.getType(); String arch = (new Shell()).exec("uname -m").getOut().get(0).replaceAll(/i.86/,"i386").replaceAll(/x86_64/,"amd64"); String archTranslated = (type == "apt") ? "" : ((arch == "amd64") ? ".x86_64" : ".${arch}"); - def config = new XmlParser().parse(TestPackagesBasics.class.getClassLoader(). - getResourceAsStream("package_data_${type}.xml")); + def config = mergeTrees(new XmlParser().parse(TestPackagesBasics.class.getClassLoader(). + getResourceAsStream("package_data.xml")), + new XmlParser().parse(TestPackagesBasics.class.getClassLoader(). + getResourceAsStream("${type}/package_data.xml"))); Map res = [:]; @@ -92,7 +119,13 @@ class TestPackagesBasics extends Package } if (name != null && (name =~ selectedTests).find() && !(name =~ skippedTests).find()) { - res[name] = ([name, it] as Object[]); + def strm = TestPackagesBasics.class.getClassLoader().getResourceAsStream("${type}/${name}.xml"); + if (strm) { + Node manifest = mergeTrees(it, new XmlParser().parse(strm)); + res[name] = ([name, manifest] as Object[]); + } else { + res[name] = ([name, it] as Object[]); + } } }; Added: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/bigtop-utils.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/bigtop-utils.xml?rev=1298204&view=auto ============================================================================== --- incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/bigtop-utils.xml (added) +++ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/bigtop-utils.xml Wed Mar 7 23:22:40 2012 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file Added: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/flume-master.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/flume-master.xml?rev=1298204&view=auto ============================================================================== --- incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/flume-master.xml (added) +++ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/flume-master.xml Wed Mar 7 23:22:40 2012 @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file Added: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/flume-node.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/flume-node.xml?rev=1298204&view=auto ============================================================================== --- incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/flume-node.xml (added) +++ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/flume-node.xml Wed Mar 7 23:22:40 2012 @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file Added: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/flume.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/flume.xml?rev=1298204&view=auto ============================================================================== --- incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/flume.xml (added) +++ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/flume.xml Wed Mar 7 23:22:40 2012 @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Added: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-conf-pseudo.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-conf-pseudo.xml?rev=1298204&view=auto ============================================================================== --- incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-conf-pseudo.xml (added) +++ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-conf-pseudo.xml Wed Mar 7 23:22:40 2012 @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Added: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-doc.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-doc.xml?rev=1298204&view=auto ============================================================================== --- incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-doc.xml (added) +++ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-doc.xml Wed Mar 7 23:22:40 2012 @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file Added: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs-datanode.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs-datanode.xml?rev=1298204&view=auto ============================================================================== --- incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs-datanode.xml (added) +++ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs-datanode.xml Wed Mar 7 23:22:40 2012 @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file Added: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs-namenode.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs-namenode.xml?rev=1298204&view=auto ============================================================================== --- incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs-namenode.xml (added) +++ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs-namenode.xml Wed Mar 7 23:22:40 2012 @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file Added: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs-secondarynamenode.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs-secondarynamenode.xml?rev=1298204&view=auto ============================================================================== --- incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs-secondarynamenode.xml (added) +++ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs-secondarynamenode.xml Wed Mar 7 23:22:40 2012 @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file Added: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs.xml?rev=1298204&view=auto ============================================================================== --- incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs.xml (added) +++ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs.xml Wed Mar 7 23:22:40 2012 @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file