You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2012/04/25 07:13:54 UTC
svn commit: r1330109 - in /incubator/bigtop/trunk/bigtop-tests:
test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy
test-artifacts/pom.xml test-execution/smokes/hadoop/pom.xml
test-execution/smokes/pom.xml
Author: rvs
Date: Wed Apr 25 05:13:53 2012
New Revision: 1330109
URL: http://svn.apache.org/viewvc?rev=1330109&view=rev
Log:
BIGTOP-545. package testing manifest in trunk needs to be updated
Modified:
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy
incubator/bigtop/trunk/bigtop-tests/test-artifacts/pom.xml
incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hadoop/pom.xml
incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pom.xml
Modified: incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy?rev=1330109&r1=1330108&r2=1330109&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy (original)
+++ incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy Wed Apr 25 05:13:53 2012
@@ -273,7 +273,7 @@ class PackageTestCommon {
meta.target = fileName.replaceAll(/^.*-> /, '');
fileName = fileName.replaceAll(/ ->.*$/, '');
}
- meta.perm = matcher[0];
+ meta.perm = matcher[0].replace('.', '');
meta.user = matcher[2];
meta.group = matcher[3];
lsFiles[fileName] = meta;
@@ -367,8 +367,6 @@ class PackageTestCommon {
Map meta = fileMeta[it];
Map goldenMeta = goldenFileMeta[formatFileName(it)];
- println goldenMeta;
-
if (goldenMeta.owners != "-1") { // TODO: we shouldn't really skip anything even for multi-owned dirs
if (meta == null ||
!meta.perm.equals(goldenMeta.perm) ||
Modified: incubator/bigtop/trunk/bigtop-tests/test-artifacts/pom.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/pom.xml?rev=1330109&r1=1330108&r2=1330109&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-tests/test-artifacts/pom.xml (original)
+++ incubator/bigtop/trunk/bigtop-tests/test-artifacts/pom.xml Wed Apr 25 05:13:53 2012
@@ -46,10 +46,10 @@
<properties>
<junit.version>4.8.2</junit.version>
<itest-common.version>0.4.0-incubating-SNAPSHOT</itest-common.version>
- <hadoop.version>0.23.1</hadoop.version>
+ <hadoop.version>2.0.0-SNAPSHOT</hadoop.version>
<pig.version>0.9.2</pig.version>
- <sqoop.version>1.4.0-incubating</sqoop.version>
- <hbase.version>0.92.0</hbase.version>
+ <sqoop.version>1.4.1-incubating</sqoop.version>
+ <hbase.version>0.92.1</hbase.version>
</properties>
<dependencyManagement>
Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hadoop/pom.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hadoop/pom.xml?rev=1330109&r1=1330108&r2=1330109&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hadoop/pom.xml (original)
+++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hadoop/pom.xml Wed Apr 25 05:13:53 2012
@@ -56,12 +56,10 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop.version}</version>
</dependency>
<!-- explicit dependency is needed to pull down transient deps. such as hadoop-examples -->
<dependency>
Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pom.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pom.xml?rev=1330109&r1=1330108&r2=1330109&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pom.xml (original)
+++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pom.xml Wed Apr 25 05:13:53 2012
@@ -37,7 +37,8 @@
<!--
BOM definitions
-->
- <hadoop.version>1.0.1</hadoop.version>
+ <hadoop.version>2.0.0-SNAPSHOT</hadoop.version>
+ <hbase.version>0.92.1</hbase.version>
<pig.version>0.9.2</pig.version>
<pig-smoke.version>0.9.2-SNAPSHOT</pig-smoke.version>
<sqoop.version>1.4.1-incubating</sqoop.version>
@@ -108,7 +109,6 @@
BOM definitions
-->
<!-- Product artifacts -->
- <!--
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
@@ -121,12 +121,17 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-test</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapred</artifactId>
+ <artifactId>hadoop-mapreduce</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
@@ -146,7 +151,12 @@
<version>${pig.version}</version>
<scope>test</scope>
</dependency>
- -->
+ <dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pigsmoke</artifactId>
+ <version>${pig.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- Test artifacts -->
<dependency>
<groupId>org.apache.bigtop.itest</groupId>