Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@accumulo.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1326587 -
 /accumulo/trunk/test/system/auto/simple/shell.py
Date: Mon, 16 Apr 2012 13:03:11 -0000
To: commits@accumulo.apache.org
From: ecn@apache.org
Message-Id: <20120416130311.4596E2388860@eris.apache.org>

Author: ecn
Date: Mon Apr 16 13:03:10 2012
New Revision: 1326587

URL: http://svn.apache.org/viewvc?rev=1326587&view=rev
Log:
ACCUMULO-535 ACCUMULO-372 remove select/selectrow tests because they are gone in 1.5

Modified:
    accumulo/trunk/test/system/auto/simple/shell.py

Modified: accumulo/trunk/test/system/auto/simple/shell.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/simple/shell.py?rev=1326587&r1=1326586&r2=1326587&view=diff
==============================================================================
--- accumulo/trunk/test/system/auto/simple/shell.py (original)
+++ accumulo/trunk/test/system/auto/simple/shell.py Mon Apr 16 13:03:10 2012
@@ -27,7 +27,7 @@ class ShellTest(TestUtilsMixin,unittest.
     Some other shell functions are tests in the systemp and tablep tests"""
     
     command_list = [ "help", "tables", "table", "createtable", "deletetable", 
-                    "insert", "selectrow", "select", "scan", "user", "users", "delete",
+                    "insert", "scan", "user", "users", "delete",
                     "flush", "config", "setiter", "deleteiter", "whoami", "debug",
                     "tablepermissions", "userpermissions", "authenticate", "createuser",
                     "dropuser", "passwd", "setauths", "getauths", "grant", "revoke" ]
@@ -51,8 +51,6 @@ class ShellTest(TestUtilsMixin,unittest.
         self.deletetableTest()
         self.scanTest()
         self.insertTest()
-        self.selectrowTest()
-        self.selectTest()
         self.flushTest()
         self.whoamiTest()
         self.getauthsTest()
@@ -220,7 +218,7 @@ class ShellTest(TestUtilsMixin,unittest.
             else:
                 if line[-10:] == "> help -np":
                     startLooking = True
-        log.debug("missing commands:" + "".join(commands))
+        log.debug("missing commands:" + ", ".join(commands))
         self.failIf(len(commands) > 0, "help command doesn't cover all the commands") 
         
     def tablesTest(self):
@@ -337,30 +335,6 @@ class ShellTest(TestUtilsMixin,unittest.
         out, err, code = self.rootShell(self.masterHost(), input)
         self.processResult(out, err, code)
         
-    def selectrowTest(self):
-        input = "createtable test_select_table\ninsert one two three four\n"
-        out, err, code = self.rootShell(self.masterHost(), input)
-        self.processResult(out, err, code)
-        input = "table test_select_table\nselectrow one -np\n"
-        out, err, code = self.rootShell(self.masterHost(), input)
-        self.processResult(out, err, code)
-        self.failUnless(out.find("one") >= 0 and out.find("two") >= 0 and 
-                        out.find("three") >= 0 and out.find("four") >= 0, 
-                        "selectrow command did not return all the values")
-        self.failUnless(out.find("one") < out.find("two") < 
-                        out.find("three") < out.find("four"), 
-                        "selectrow command did not return the values in the right order")
-        
-    def selectTest(self):
-        input = "createtable test_select_table2\ninsert one two three seven\n"
-        out, err, code = self.rootShell(self.masterHost(), input)
-        self.processResult(out, err, code)
-        input = "table test_select_table2\nselect one two three -np\n"
-        out, err, code = self.rootShell(self.masterHost(), input)
-        self.processResult(out, err, code)
-        self.failUnless(out.find("seven") >= 0, 
-                        "select command did not return the correct values")
-        
     def flushTest(self):
         input = "flush -t !METADATA\n"
         out, err, code = self.rootShell(self.masterHost(), input)