diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/common/test_diskdir.py | 3 | ||||
| -rw-r--r-- | test/unit/common/test_utils.py | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/test/unit/common/test_diskdir.py b/test/unit/common/test_diskdir.py index 964bc2f..ae9aa6e 100644 --- a/test/unit/common/test_diskdir.py +++ b/test/unit/common/test_diskdir.py @@ -279,7 +279,7 @@ class TestDiskCommon(unittest.TestCase): assert dc.logger == self.fake_logger assert dc.account == self.fake_accounts[0] assert dc.datadir == os.path.join(self.td, self.fake_drives[0]) - assert dc._dir_exists is None + assert dc._dir_exists is False def test__dir_exists_read_metadata_exists(self): datadir = os.path.join(self.td, self.fake_drives[0]) @@ -315,6 +315,7 @@ class TestDiskCommon(unittest.TestCase): def test_is_deleted(self): dc = dd.DiskCommon(self.td, self.fake_drives[0], self.fake_accounts[0], self.fake_logger) + dc._dir_exists_read_metadata() assert dc.is_deleted() == False def test_update_metadata(self): diff --git a/test/unit/common/test_utils.py b/test/unit/common/test_utils.py index 4790304..136c3a9 100644 --- a/test/unit/common/test_utils.py +++ b/test/unit/common/test_utils.py @@ -670,9 +670,13 @@ class TestUtils(unittest.TestCase): def test_get_account_details_notadir(self): tf = tempfile.NamedTemporaryFile() - container_list, container_count = utils.get_account_details(tf.name) - assert container_count == 0 - assert container_list == [] + try: + utils.get_account_details(tf.name) + except OSError as err: + if err.errno != errno.ENOTDIR: + self.fail("Expecting ENOTDIR") + else: + self.fail("Expecting ENOTDIR") def test_get_container_details_notadir(self): tf = tempfile.NamedTemporaryFile() |