diff options
Diffstat (limited to 'src/software/test/test_software_file_check.py')
-rwxr-xr-x | src/software/test/test_software_file_check.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/software/test/test_software_file_check.py b/src/software/test/test_software_file_check.py index cb09282..d44fd10 100755 --- a/src/software/test/test_software_file_check.py +++ b/src/software/test/test_software_file_check.py @@ -136,7 +136,7 @@ class TestSoftwareFileCheck(common.SoftwareBaseTestCase): return RE_CHECKSUM.match(subprocess.check_output([ self.hash_num2cmd[csumnum], filename])).group(1).lower() - def do_test_symlink(self, filepath, inst): + def do_check_symlink(self, filepath, inst): """ Assert some details about symlink. """ @@ -199,7 +199,7 @@ class TestSoftwareFileCheck(common.SoftwareBaseTestCase): self.assertTrue(cur_pflags.gid) self.assertTrue(cur_pflags.mtime) - def do_test_directory(self, filepath, inst): + def do_check_directory(self, filepath, inst): """ Assert some details about directory. """ @@ -216,7 +216,7 @@ class TestSoftwareFileCheck(common.SoftwareBaseTestCase): self.assertEqual(inst["LastModificationTime"], int(stats.st_mtime)) - def do_test_file(self, filepath, inst): + def do_check_file(self, filepath, inst): """ Assert some details about regurar file. """ @@ -340,11 +340,11 @@ class TestSoftwareFileCheck(common.SoftwareBaseTestCase): , "FileChecksum", "FileModeFlags"): self.assertEqual(inst["Expected"+prop], inst[prop]) if os.path.islink(filepath): - self.do_test_symlink(filepath, inst) + self.do_check_symlink(filepath, inst) elif os.path.isdir(filepath): - self.do_test_directory(filepath, inst) + self.do_check_directory(filepath, inst) elif os.path.isfile(filepath): - self.do_test_file(filepath, inst) + self.do_check_file(filepath, inst) @common.mark_dangerous def test_invoke_method(self): |