From 83cbeb4cb50319dabe631d878ff5ec2ea5c1376c Mon Sep 17 00:00:00 2001 From: "Martin A. Brown" Date: Wed, 11 May 2016 08:57:54 -0700 Subject: [PATCH] reset mode during testing; specify errnos to expect --- tests/test_utils.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/test_utils.py b/tests/test_utils.py index d5b0236..9594716 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -48,14 +48,18 @@ class Test_isreadablefile_and_friends(unittest.TestCase): def test_isreadablefile(self): f = ntf(prefix='readable-file') self.assertTrue(isreadablefile(f.name)) + mode = os.stat(f.name).st_mode os.chmod(f.name, 0) self.assertFalse(isreadablefile(f.name)) + os.chmod(f.name, mode) def test_arg_isreadablefile(self): f = ntf(prefix='readable-file') self.assertEqual(f.name, arg_isreadablefile(f.name)) + mode = os.stat(f.name).st_mode os.chmod(f.name, 0) self.assertIsNone(arg_isreadablefile(f.name)) + os.chmod(f.name, mode) class Test_arg_isstr(unittest.TestCase): @@ -206,8 +210,10 @@ class Test_statfile(TestToolsFilesystem): f = ntf(dir=self.tempdir) omode = os.stat(self.tempdir).st_mode os.chmod(self.tempdir, 0) - with self.assertRaises(OSError): + with self.assertRaises(Exception) as ecm: statfile(f.name) + e = ecm.exception + self.assertIn(e.errno, (errno.EPERM, errno.EACCES)) os.chmod(self.tempdir, omode) stbuf = statfile(f.name) self.assertIsInstance(stbuf, posix.stat_result)