small fix in DeleteThread_Test

UnitTests/DeleteThread_Test.py

@@ -89,7 +89,7 @@ class TestDeleteThread(unittest.TestCase):
     @unittest.mock.patch('cs.Threads.DeleteThread.DeleteThread.delete', new=mockdel)
     @unittest.mock.patch('cs.Threads.DeleteThread.DeleteThread._getFileSystemUsage')
     def test_basic(self, mock_gfsu):
-        dt = DeleteThread.DeleteThread(type(self).basic_conf, type(self).ev,
+        dt = DeleteThread.DeleteThread(self.c, type(self).ev,
                 type(self).dblock, type(self).dq, type(self).cq)
         mock_gfsu.return_value = {'/': 10}
         fmd = FMD('/srcdir/todelete', '/eos/dummy', 'eosdummy', 0)
@@ -103,9 +103,8 @@ class TestDeleteThread(unittest.TestCase):
     @unittest.mock.patch('cs.Threads.DeleteThread.DeleteThread.delete', new=mockdel)
     @unittest.mock.patch('cs.Threads.DeleteThread.DeleteThread._getFileSystemUsage')
     def test_exclude_regex(self, mock_gfsu):
-        conf = type(self).getBasicConf()
-        conf.DeleteExcludeFileRegex = '.*DONOTDELETE.*'
-        dt = DeleteThread.DeleteThread(conf, type(self).ev,
+        self.c.DeleteExcludeFileRegex = '.*DONOTDELETE.*'
+        dt = DeleteThread.DeleteThread(self.c, type(self).ev,
                 type(self).dblock, type(self).dq, type(self).cq)
         mock_gfsu.return_value = {'/': 10}
 
@@ -126,9 +125,8 @@ class TestDeleteThread(unittest.TestCase):
     @unittest.mock.patch('cs.Threads.DeleteThread.DeleteThread.delete', new=mockdel)
     @unittest.mock.patch('cs.Threads.DeleteThread.DeleteThread._getFileSystemUsage')
     def test_min_file_age(self, mock_gfsu):
-        conf = type(self).getBasicConf()
-        conf.DeleteMinFileAge = 100
-        dt = DeleteThread.DeleteThread(conf, type(self).ev,
+        self.c.DeleteMinFileAge = 100
+        dt = DeleteThread.DeleteThread(self.c, type(self).ev,
                 type(self).dblock, type(self).dq, type(self).cq)
         mock_gfsu.return_value = {'/': 10}
 
@@ -150,9 +148,8 @@ class TestDeleteThread(unittest.TestCase):
     @unittest.mock.patch('cs.Threads.DeleteThread.dir_is_locked')
     @unittest.mock.patch('cs.Threads.DeleteThread.DeleteThread._getFileSystemUsage')
     def test_locked_dir(self, mock_gfsu, mock_dil):
-        conf = type(self).getBasicConf()
-        conf.DeleteIgnoreLock = False
-        dt = DeleteThread.DeleteThread(conf, type(self).ev,
+        self.c.DeleteIgnoreLock = False
+        dt = DeleteThread.DeleteThread(self.c, type(self).ev,
                 type(self).dblock, type(self).dq, type(self).cq)
         mock_gfsu.return_value = {'/': 10}
 
@@ -175,10 +172,9 @@ class TestDeleteThread(unittest.TestCase):
     @unittest.mock.patch('cs.Threads.DeleteThread.DeleteThread.delete', new=mockdel)
     @unittest.mock.patch('cs.Threads.DeleteThread.DeleteThread._getFileSystemUsage')
     def test_low_watermark(self, mock_gfsu):
-        conf = type(self).getBasicConf()
-        conf.DeleteLowWaterMark = [20]
-        conf.DeleteFileSystemUsagePeriod = 1
-        dt = DeleteThread.DeleteThread(conf, type(self).ev,
+        self.c.DeleteLowWaterMark = [20]
+        self.c.DeleteFileSystemUsagePeriod = 1
+        dt = DeleteThread.DeleteThread(self.c, type(self).ev,
                 type(self).dblock, type(self).dq, type(self).cq)
 
         mock_gfsu.return_value = {'/': 10}
@@ -211,10 +207,9 @@ class TestDeleteThread(unittest.TestCase):
     @unittest.mock.patch('cs.Threads.DeleteThread.DeleteThread.checkMigration')
     @unittest.mock.patch('cs.Threads.DeleteThread.DeleteThread.getFileSystemUsage')
     def test_migration_delay(self, mock_gfsu, mock_cm, mock_gct):
-        conf = type(self).getBasicConf()
-        conf.MigrationCheck = True
-        conf.MigrationCheckDelay = 1
-        dt = DeleteThread.DeleteThread(conf, type(self).ev,
+        self.c.MigrationCheck = True
+        self.c.MigrationCheckDelay = 1
+        dt = DeleteThread.DeleteThread(self.c, type(self).ev,
                 type(self).dblock, type(self).dq, type(self).cq)
         mock_gfsu.return_value = 10
         mock_cm.return_value = True
@@ -250,10 +245,9 @@ class TestDeleteThread(unittest.TestCase):
     @unittest.mock.patch('cs.Threads.DeleteThread.DeleteThread.checkMigration')
     @unittest.mock.patch('cs.Threads.DeleteThread.DeleteThread.getFileSystemUsage')
     def test_migration(self, mock_gfsu, mock_cm):
-        conf = type(self).getBasicConf()
-        conf.MigrationCheck = True
-        conf.MigrationCheckDelay = 0
-        dt = DeleteThread.DeleteThread(conf, type(self).ev,
+        self.c.MigrationCheck = True
+        self.c.MigrationCheckDelay = 0
+        dt = DeleteThread.DeleteThread(self.c, type(self).ev,
                 type(self).dblock, type(self).dq, type(self).cq)
         mock_gfsu.return_value = 10
 
@@ -276,12 +270,11 @@ class TestDeleteThread(unittest.TestCase):
     @unittest.mock.patch('cs.Threads.DeleteThread.DeleteThread.checkMigration')
     @unittest.mock.patch('cs.Threads.DeleteThread.DeleteThread.getFileSystemUsage')
     def test_critical_marks(self, mock_gfsu, mock_cm):
-        conf = type(self).getBasicConf()
-        conf.MigrationCheck = True
-        conf.MigrationCheckDelay = 0
-        conf.DeleteHighCriticalMark = 90
-        conf.DeleteLowCriticalMark = 80
-        dt = DeleteThread.DeleteThread(conf, type(self).ev,
+        self.c.MigrationCheck = True
+        self.c.MigrationCheckDelay = 0
+        self.c.DeleteHighCriticalMark = 90
+        self.c.DeleteLowCriticalMark = 80
+        dt = DeleteThread.DeleteThread(self.c, type(self).ev,
                 type(self).dblock, type(self).dq, type(self).cq)
         mock_cm.return_value = False
         fmd = FMD('/srcdir/file', '/eos/dummy', 'eosdummy', 0)