You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ga...@apache.org on 2011/06/07 00:05:17 UTC
svn commit: r1132800 - in /pig/trunk: CHANGES.txt
test/e2e/harness/TestDriver.pm test/e2e/harness/test/tests/test.conf
test/e2e/pig/conf/default.conf
Author: gates
Date: Mon Jun 6 22:05:16 2011
New Revision: 1132800
URL: http://svn.apache.org/viewvc?rev=1132800&view=rev
Log:
PIG-2108 e2e test harness needs to be able to mark certain tests as ignored
Modified:
pig/trunk/CHANGES.txt
pig/trunk/test/e2e/harness/TestDriver.pm
pig/trunk/test/e2e/harness/test/tests/test.conf
pig/trunk/test/e2e/pig/conf/default.conf
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1132800&r1=1132799&r2=1132800&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Jun 6 22:05:16 2011
@@ -24,6 +24,9 @@ INCOMPATIBLE CHANGES
IMPROVEMENTS
+PIG-2108 e2e test harness needs to be able to mark certain tests as ignored
+ (gates)
+
PIG-1825: ability to turn off the write ahead log for pig's HBaseStorage (billgraham via dvryaboy)
PIG-1772: Pig 090 Documentation (chandec via olgan)
Modified: pig/trunk/test/e2e/harness/TestDriver.pm
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/harness/TestDriver.pm?rev=1132800&r1=1132799&r2=1132800&view=diff
==============================================================================
--- pig/trunk/test/e2e/harness/TestDriver.pm (original)
+++ pig/trunk/test/e2e/harness/TestDriver.pm Mon Jun 6 22:05:16 2011
@@ -368,18 +368,26 @@ sub run
foreach (keys(%$test)) {
$testHash{$_} = $test->{$_};
}
+
my $testName = $testHash{'group'} . "_" . $testHash{'num'};
- if ( $groupExecuted{ $group->{'name'} }== 0 ){
- $groupExecuted{ $group->{'name'} }=1;
-
- my $xmlDir= $globalHash{'localxmlpathbase'}."/run".$globalHash->{'UID'};
- mkpath( [ $xmlDir ] , 1, 0777) if ( ! -e $xmlDir );
-
- my $filename = $group->{'name'}.".xml";
- $report = new TestReport ( $properties, "$xmlDir/$filename" );
- $report->purge();
- }
+# if ( $groupExecuted{ $group->{'name'} }== 0 ){
+# $groupExecuted{ $group->{'name'} }=1;
+#
+# my $xmlDir= $globalHash{'localxmlpathbase'}."/run".$globalHash->{'UID'};
+# mkpath( [ $xmlDir ] , 1, 0777) if ( ! -e $xmlDir );
+#
+# my $filename = $group->{'name'}.".xml";
+# $report = new TestReport ( $properties, "$xmlDir/$filename" );
+# $report->purge();
+# }
+
+ # Check that ignore isn't set for this file, group, or test
+ if (defined $testHash{'ignore'}) {
+ print $log "Ignoring test $testName, ignore message: " .
+ $testHash{'ignore'} . "\n";
+ next;
+ }
# Have we not reached the starting point yet?
if (!$sawstart) {
Modified: pig/trunk/test/e2e/harness/test/tests/test.conf
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/harness/test/tests/test.conf?rev=1132800&r1=1132799&r2=1132800&view=diff
==============================================================================
--- pig/trunk/test/e2e/harness/test/tests/test.conf (original)
+++ pig/trunk/test/e2e/harness/test/tests/test.conf Mon Jun 6 22:05:16 2011
@@ -36,7 +36,13 @@ $cfg = {
'num' => 2,
'rc' => 2,
'benchmark_rc' => 2,
- }
+ },
+ {
+ 'num' => 3,
+ 'rc' => 2,
+ 'benchmark_rc' => 2,
+ 'ignore' => 'testing ignore',
+ },
]
},
],
Modified: pig/trunk/test/e2e/pig/conf/default.conf
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/conf/default.conf?rev=1132800&r1=1132799&r2=1132800&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/conf/default.conf (original)
+++ pig/trunk/test/e2e/pig/conf/default.conf Mon Jun 6 22:05:16 2011
@@ -53,7 +53,7 @@ $cfg = {
#DATABASE
- , 'dbdb' => 'pigtest2'
+ , 'dbdb' => 'pigtest'
, 'dbuser' => 'pigtester'
, 'dbowner' => 'hadoopqa'
, 'dbgroup' => 'users'