svn commit: r1405492 - in /accumulo/trunk: .gitignore test/system/bench/cloudstone1/cloudstone1.py test/system/bench/lib/cloudshell.py

[el...@apache.org]

Author: elserj
Date: Sun Nov  4 02:51:42 2012
New Revision: 1405492

URL: http://svn.apache.org/viewvc?rev=1405492&view=rev
Log:
ACCUMULO-827 Fixed up CloudStone1
- Fixed accumulo shell command
- Added assertion to CloudStone1
- Added pyc files to .gitignore

Modified:
    accumulo/trunk/.gitignore
    accumulo/trunk/test/system/bench/cloudstone1/cloudstone1.py
    accumulo/trunk/test/system/bench/lib/cloudshell.py

Modified: accumulo/trunk/.gitignore
URL: http://svn.apache.org/viewvc/accumulo/trunk/.gitignore?rev=1405492&r1=1405491&r2=1405492&view=diff
==============================================================================
--- accumulo/trunk/.gitignore (original)
+++ accumulo/trunk/.gitignore Sun Nov  4 02:51:42 2012
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 # /
+*.pyc
 /logs
 /walogs
 /target

Modified: accumulo/trunk/test/system/bench/cloudstone1/cloudstone1.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/bench/cloudstone1/cloudstone1.py?rev=1405492&r1=1405491&r2=1405492&view=diff
==============================================================================
--- accumulo/trunk/test/system/bench/cloudstone1/cloudstone1.py (original)
+++ accumulo/trunk/test/system/bench/cloudstone1/cloudstone1.py Sun Nov  4 02:51:42 2012
@@ -30,6 +30,7 @@ class CloudStone1(Benchmark):
 
     def runTest(self):
         code, out, err = cloudshell.run(self.username, self.password, 'table !METADATA\nscan\n')
+        self.assertEqual(code, 0, "Could not scan the !METADATA table. %s %s" % (out, err))
         results = runAll('echo help | %s shell' %
                          accumulo('bin', 'accumulo'))
                          

Modified: accumulo/trunk/test/system/bench/lib/cloudshell.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/bench/lib/cloudshell.py?rev=1405492&r1=1405491&r2=1405492&view=diff
==============================================================================
--- accumulo/trunk/test/system/bench/lib/cloudshell.py (original)
+++ accumulo/trunk/test/system/bench/lib/cloudshell.py Sun Nov  4 02:51:42 2012
@@ -23,7 +23,7 @@ from lib.options import log
     
 def run(username, password, input):
     "Run a command in accumulo"
-    handle = runner.start([path.accumulo('bin', 'accumulo'), 'shell -u %s -p %s' % (username, password) ],
+    handle = runner.start([path.accumulo('bin', 'accumulo'), 'shell', '-u', username, '-p', password],
                           stdin=subprocess.PIPE)
     log.debug("Running: %r", input)
     out, err = handle.communicate(input)