ACCUMULO-1519 removing force flag from deletetable commands in cloudstone tests
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.4@1500455 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/732e881e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/732e881e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/732e881e Branch: refs/heads/master Commit: 732e881e57aace131e0dd45043dbd1f53c4c5e1f Parents: d5da59a Author: Mike Drob <[email protected]> Authored: Sun Jul 7 15:37:10 2013 +0000 Committer: Mike Drob <[email protected]> Committed: Sun Jul 7 15:37:10 2013 +0000 ---------------------------------------------------------------------- test/system/bench/lib/CreateTablesBenchmark.py | 4 ++-- test/system/bench/lib/IngestBenchmark.py | 4 ++-- test/system/bench/lib/RowHashBenchmark.py | 8 ++++---- test/system/bench/lib/TableSplitsBenchmark.py | 4 ++-- test/system/bench/lib/TeraSortBenchmark.py | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/732e881e/test/system/bench/lib/CreateTablesBenchmark.py ---------------------------------------------------------------------- diff --git a/test/system/bench/lib/CreateTablesBenchmark.py b/test/system/bench/lib/CreateTablesBenchmark.py index 8e129b7..f900108 100755 --- a/test/system/bench/lib/CreateTablesBenchmark.py +++ b/test/system/bench/lib/CreateTablesBenchmark.py @@ -35,7 +35,7 @@ class CreateTablesBenchmark(Benchmark): log.debug("Checking for table existence: %s" % currentTable) code, out, err = cloudshell.run(self.username, self.password, 'table %s\n' % currentTable) if out.find('does not exist') == -1: - command = 'deletetable -f %s\n' % (currentTable) + command = 'deletetable %s\n' % (currentTable) log.debug("Running Command %r", command) code, out, err = cloudshell.run(self.username, self.password, command) self.assertEqual(code, 0, 'Did not successfully delete table: %s' % currentTable) @@ -51,7 +51,7 @@ class CreateTablesBenchmark(Benchmark): # print err for x in range(1, self.tables): currentTable = 'test_ingest%d' % (x) - command = 'deletetable -f %s\n' % (currentTable) + command = 'deletetable %s\n' % (currentTable) log.debug("Running Command %r", command) code, out, err = cloudshell.run(self.username, self.password, command) self.assertEqual(code, 0, 'Did not successfully delete table: %s' % currentTable) http://git-wip-us.apache.org/repos/asf/accumulo/blob/732e881e/test/system/bench/lib/IngestBenchmark.py ---------------------------------------------------------------------- diff --git a/test/system/bench/lib/IngestBenchmark.py b/test/system/bench/lib/IngestBenchmark.py index 32023f4..9370810 100755 --- a/test/system/bench/lib/IngestBenchmark.py +++ b/test/system/bench/lib/IngestBenchmark.py @@ -32,14 +32,14 @@ class IngestBenchmark(Benchmark): code, out, err = cloudshell.run(self.username, self.password, 'table test_ingest\n') if out.find('does not exist') == -1: log.debug("Deleting table test_ingest") - code, out, err = cloudshell.run(self.username, self.password, 'deletetable -f test_ingest\n') + code, out, err = cloudshell.run(self.username, self.password, 'deletetable test_ingest\n') self.assertEquals(code, 0, "Could not delete the table 'test_ingest'") code, out, err = cloudshell.run(self.username, self.password, 'createtable test_ingest\n') self.assertEqual(code, 0, "Could not create the table 'test_ingest'") Benchmark.setUp(self) def tearDown(self): - command = 'deletetable -f test_ingest\n' + command = 'deletetable test_ingest\n' log.debug("Running Command %r", command) code, out, err = cloudshell.run(self.username, self.password, command) self.assertEqual(code, 0, "Could not delete the table 'test_ingest'") http://git-wip-us.apache.org/repos/asf/accumulo/blob/732e881e/test/system/bench/lib/RowHashBenchmark.py ---------------------------------------------------------------------- diff --git a/test/system/bench/lib/RowHashBenchmark.py b/test/system/bench/lib/RowHashBenchmark.py index 1f678bd..95c91f7 100755 --- a/test/system/bench/lib/RowHashBenchmark.py +++ b/test/system/bench/lib/RowHashBenchmark.py @@ -46,12 +46,12 @@ class RowHashBenchmark(Benchmark): file = os.path.join( dir, 'splits' ) code, out, err = cloudshell.run(self.username, self.password, 'table %s\n' % self.input_table) if out.find('does not exist') == -1: - code, out, err = cloudshell.run(self.username, self.password, 'deletetable -f %s\n' % self.input_table) + code, out, err = cloudshell.run(self.username, self.password, 'deletetable %s\n' % self.input_table) self.sleep(15) code, out, err = cloudshell.run(self.username, self.password, "createtable %s -sf %s\n" % (self.input_table, file)) code, out, err = cloudshell.run(self.username, self.password, 'table %s\n' % self.output_table) if out.find('does not exist') == -1: - code, out, err = cloudshell.run(self.username, self.password, 'deletetable -f %s\n' % + code, out, err = cloudshell.run(self.username, self.password, 'deletetable %s\n' % self.output_table) self.sleep(15) code, out, err = cloudshell.run(self.username, self.password, "createtable %s -sf %s\n" % (self.output_table, file)) @@ -73,9 +73,9 @@ class RowHashBenchmark(Benchmark): Benchmark.setUp(self) def tearDown(self): - code, out, err = cloudshell.run(self.username, self.password, "deletetable -f %s\n" % self.input_table) + code, out, err = cloudshell.run(self.username, self.password, "deletetable %s\n" % self.input_table) self.assertEqual(code, 0, 'Could not delete %s, %s' % (self.input_table, out)) - code, out, err = cloudshell.run(self.username, self.password, "deletetable -f %s\n" % self.output_table) + code, out, err = cloudshell.run(self.username, self.password, "deletetable %s\n" % self.output_table) self.assertEqual(code, 0, 'Could not delete %s, %s' % (self.output_table, out)) Benchmark.tearDown(self) http://git-wip-us.apache.org/repos/asf/accumulo/blob/732e881e/test/system/bench/lib/TableSplitsBenchmark.py ---------------------------------------------------------------------- diff --git a/test/system/bench/lib/TableSplitsBenchmark.py b/test/system/bench/lib/TableSplitsBenchmark.py index 67414ea..ea509b8 100755 --- a/test/system/bench/lib/TableSplitsBenchmark.py +++ b/test/system/bench/lib/TableSplitsBenchmark.py @@ -39,7 +39,7 @@ class TableSplitsBenchmark(Benchmark): code, out, err = cloudshell.run(self.username, self.password, 'table %s\n' % self.tablename) if out.find('does not exist') == -1: log.debug('Deleting table %s' % self.tablename) - code, out, err = cloudshell.run(self.username, self.password, 'deletetable -f %s\n' % self.tablename) + code, out, err = cloudshell.run(self.username, self.password, 'deletetable %s\n' % self.tablename) self.assertEqual(code, 0, "Could not delete table") Benchmark.setUp(self) @@ -54,7 +54,7 @@ class TableSplitsBenchmark(Benchmark): return 'Creates a table with splits. Lower score is better.' def tearDown(self): - command = 'deletetable -f %s\n' % self.tablename + command = 'deletetable %s\n' % self.tablename log.debug("Running Command %r", command) code, out, err = cloudshell.run(self.username, self.password, command) self.assertEqual(code, 0, "Could not delete table") http://git-wip-us.apache.org/repos/asf/accumulo/blob/732e881e/test/system/bench/lib/TeraSortBenchmark.py ---------------------------------------------------------------------- diff --git a/test/system/bench/lib/TeraSortBenchmark.py b/test/system/bench/lib/TeraSortBenchmark.py index 5f3e1b7..602e07a 100755 --- a/test/system/bench/lib/TeraSortBenchmark.py +++ b/test/system/bench/lib/TeraSortBenchmark.py @@ -45,11 +45,11 @@ class TeraSortBenchmark(Benchmark): code, out, err = cloudshell.run(self.username, self.password, 'table %s\n' % self.tablename) if out.find('does not exist') == -1: log.debug('Deleting table %s' % self.tablename) - code, out, err = cloudshell.run(self.username, self.password, 'deletetable -f %s\n' % self.tablename) + code, out, err = cloudshell.run(self.username, self.password, 'deletetable %s\n' % self.tablename) Benchmark.setUp(self) def tearDown(self): - code, out, err = cloudshell.run(self.username, self.password, "deletetable -f %s\n" % self.tablename) + code, out, err = cloudshell.run(self.username, self.password, "deletetable %s\n" % self.tablename) self.assertEqual(code, 0, 'Could not delete %s, %s' % (self.tablename, out)) Benchmark.tearDown(self)
