x/slogging
Code Issues Proposed changes

I don't know what that test was even doing

Browse Source
This commit is contained in:
John Dickinson 2015-02-15 11:24:12 -08:00
parent 791a8ab8ff
commit 1a5ece3804
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test_slogging/unit/test_db_stats_collector.py
View File

@ -96,7 +96,7 @@ class TestDbStats(unittest.TestCase):
self.assertEqual(len(output_data), 10) self.assertEqual(len(output_data), 10)
return stat, output_data return stat, output_data
def _gen_container_stat(self, set_metadata=False, drop_metadata=False): def _gen_container_stat(self, set_metadata=False):
if set_metadata: if set_metadata:
self.conf['metadata_keys'] = 'test1,test2' self.conf['metadata_keys'] = 'test1,test2'
# webob runs title on all headers # webob runs title on all headers
@ -119,11 +119,8 @@ class TestDbStats(unittest.TestCase):
metadata_output = ',,1' metadata_output = ',,1'
# this will "commit" the data # this will "commit" the data
cont_db.get_info() cont_db.get_info()
if drop_metadata: output_data.add('''"test_acc_%s","test_con",1,10%s''' %
output_data.add('''"test_acc_%s","test_con",1,10,,''' % i) (i, metadata_output))
else:
output_data.add('''"test_acc_%s","test_con",1,10%s''' %
(i, metadata_output))
self.assertEqual(len(output_data), 10) self.assertEqual(len(output_data), 10)
return stat, output_data return stat, output_data
@ -162,21 +159,6 @@ class TestDbStats(unittest.TestCase):
self.assertEqual(len(output_data), 0) self.assertEqual(len(output_data), 0)
def test_account_stat_run_once_container_no_metadata(self):
stat, output_data = self._gen_container_stat(set_metadata=True,
drop_metadata=True)
stat.run_once()
stat_file = os.listdir(self.log_dir)[0]
with open(os.path.join(self.log_dir, stat_file)) as stat_handle:
headers = stat_handle.readline()
self.assert_(headers.startswith('Account Hash,Container Name,'))
for i in range(10):
data = stat_handle.readline()
output_data.discard(data.strip())
self.assertEqual(len(output_data), 0)
def test_account_stat_run_once_both(self): def test_account_stat_run_once_both(self):
acc_stat, acc_output_data = self._gen_account_stat() acc_stat, acc_output_data = self._gen_account_stat()
con_stat, con_output_data = self._gen_container_stat() con_stat, con_output_data = self._gen_container_stat()