Changeset 8725 for main

Timestamp:

14 Jun 2012, 16:47:57 (13 years ago)

Author:

uli

Message:

Search only logfiles with correct basename, fix tests.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• datacenter.py (modified) (1 diff)
• tests/test_datacenter.py (modified) (8 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/datacenter.py

@@ -224 +224 @@
         for name in os.listdir(os.path.join(self.storage, 'logs')):
             if RE_LOGFILE_BACKUP_NAME.match(name):
-                files.append(name)
+                if name.rsplit('.', 1)[0] == basename:
+                    files.append(name)
         return sorted(files, key=numerical_suffix, reverse=True)
 

main/waeup.kofa/trunk/src/waeup/kofa/tests/test_datacenter.py

@@ -12 +12 @@
 from waeup.kofa.interfaces import IDataCenter, IDataCenterConfig
 
-
 class DataCenterLogQueryTests(unittest.TestCase):
     # Tests for querying logfiles via datacenter.
@@ -37 +36 @@
         path = self.logpath
         for m in range(num-1,-1,-1):
+            # write messages in order: lowest message in oldest file
             fp = open(path, 'wb')
             for n in range(50*m, 50*m+50):
@@ -42 +42 @@
                 fp.write('Other Line %d\n' % (n + 1))
             fp.close()
-            path = self.logpath + '.%d' % (m + 1)
+            path = self.logpath + '.%d' % m
         return
 
@@ -75 +75 @@
         open(self.logpath, 'wb').write('Msg 1\n')
         open(self.logpath + '-not-a-real-log', 'wb').write('Msg 2\n')
+        open(self.logpath + '-not-a-real-log.1', 'wb').write('Msg 3\n')
         result = list(datacenter.queryLogfiles('myapp.log', 'Msg'))
-        # Msg 2 won't show up in results.
+        # Msg 2 and 3 won't show up in results.
         self.assertEqual(result, ['Msg 1\n'])
         return
@@ -226 +227 @@
         # The source is deleted afterwards
         self.assertEqual(os.path.exists(csv_file2), False)
+        return
 
     def test_append_csv_file_no_dest(self):
@@ -240 +242 @@
         # The source is deleted afterwards
         self.assertEqual(os.path.exists(csv_file2), False)
+        return
 
     def test_append_csv_file_no_source(self):
@@ -252 +255 @@
         # csv_file1 is the same as before
         self.assertEqual(result, 'name,age\nManfred,28\n')
+        return
 
     def test_append_csv_file_same_src_and_dest(self):
@@ -265 +269 @@
         self.assertEqual(result, 'name,age\nManfred,28\n')
         self.assertEqual(os.path.exists(csv_file2), True)
+        return