accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [02/37] git commit: ACCUMULO-1520 misc functional test fixes
Date Tue, 26 Nov 2013 15:17:57 GMT
ACCUMULO-1520 misc functional test fixes

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1494361 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 9ac99ea8b402792b36c494c02ac3103e7a061e2a)

Reason: Test
Author: Billie Rinaldi <billie@apache.org>
Ref: ACCUMULO-1792

Hadoop2 by default emits extra logging information to stdout which causes accumulo's ListTables
to emit
extra data to stdout.  This filters out these invalid lines ListTables.

Author: Jon Hsieh <jmhsieh@apache.org>

Included the presplit multiplier portion because the LongRowTest has been failing for me regularly
on VMs on 1.4.5-SNAPSHOT and this change makes 1.4.x consistent with the other active development
branches.

Included the search example change for consistency since the rest of hte patch was applicable.

Author: Sean Busbey <busbey@clouderagovt.com>

Signed-off-by: Eric Newton <eric.newton@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/aff0d641
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aff0d641
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aff0d641

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: aff0d641274d78a5682defbd5e6d0717aac68546
Parents: 1fe5f7f
Author: Jonathan M Hsieh <jon@cloudera.com>
Authored: Mon Jun 24 00:36:19 2013 -0700
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Mon Nov 25 16:06:41 2013 -0500

----------------------------------------------------------------------
 .../apache/accumulo/server/test/functional/LargeRowTest.java   | 2 +-
 test/system/auto/TestUtils.py                                  | 5 +++++
 test/system/auto/simple/examples.py                            | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/aff0d641/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
b/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
index bc02929..df98f6e 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
@@ -95,7 +95,7 @@ public class LargeRowTest extends FunctionalTest {
     
     UtilWaitThread.sleep(10000);
     
-    checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS / 2, NUM_PRE_SPLITS);
+    checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS / 2, NUM_PRE_SPLITS * 4);
     
     verify(REG_TABLE_NAME);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/aff0d641/test/system/auto/TestUtils.py
----------------------------------------------------------------------
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index b70677a..b7659a2 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -458,6 +458,11 @@ class TestUtilsMixin:
         out,err = handle.communicate()
         self.assert_(handle.returncode==0)
         for line in out.split('\n') :
+
+            # filter out unwanted extra hadoop2 logging
+            if line.find("=>") < 0:
+               continue
+
             left, right = line.split("=>")
             left = left.strip()
             right = right.strip()

http://git-wip-us.apache.org/repos/asf/accumulo/blob/aff0d641/test/system/auto/simple/examples.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/examples.py b/test/system/auto/simple/examples.py
index b22411a..bed321f 100755
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@ -80,14 +80,14 @@ class Examples(TestUtilsMixin, unittest.TestCase):
                      'dataTable',
                      visibility,
                      100000,
-                     ACCUMULO_HOME+"/src")
+                     ACCUMULO_HOME+"/test")
         self.comment("  searching for a file")
         handle = self.runOn('localhost', [self.accumulo_sh(), 'org.apache.accumulo.examples.simple.dirlist.QueryUtil',
                                           INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD,
-                                          'indexTable', auths, 'Fate.java', '-search'])
+                                          'indexTable', auths, 'examples.py', '-search'])
         out, err = handle.communicate()
         self.assert_(handle.returncode == 0)
-        self.assert_(out.find('accumulo/server/fate/Fate.java') >= 0)
+        self.assert_(out.find('test/system/auto/simple/examples.py') >= 0)
         self.comment("  found file at " + out)
 
     


Mime
View raw message