LDP
/
python-tldp
mirror of https://github.com/tLDP/python-tldp
0
1
Fork 0
Code Releases Activity

adjust error-raising invocations (and tests)

This commit is contained in:
Martin A. Brown 2016-02-15 21:32:35 -08:00
parent ae189e0d83
commit 01bee4a269
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/test_sources.py
View File

@ -2,6 +2,7 @@
from __future__ import absolute_import, division, print_function
import os
import errno
import unittest
from tempfile import NamedTemporaryFile as ntf
from tempfile import mkdtemp, mkstemp
@ -98,18 +99,18 @@ class TestInvalidSourceDirs(TestSourceDirs):
def test_validateDirs_onebad(self):
invalid0 = os.path.join(self.tempdir, 'unique', 'rabbit')
with self.assertRaises(OSError) as ecm:
with self.assertRaises(IOError) as ecm:
SourceDirs([invalid0])
e = ecm.exception
self.assertTrue('unique/rabbit' in e.message)
self.assertTrue('unique/rabbit' in e.filename)
def test_validateDirs_multibad(self):
invalid0 = os.path.join(self.tempdir, 'unique', 'rabbit')
invalid1 = os.path.join(self.tempdir, 'affable', 'elephant')
with self.assertRaises(OSError) as ecm:
with self.assertRaises(IOError) as ecm:
SourceDirs([invalid0, invalid1])
e = ecm.exception
self.assertTrue('affable/elephant' in e.message)
self.assertTrue('affable/elephant' in e.filename)
def testEmptyDir(self):
s = SourceDirs([self.tempdir])
@ -120,12 +121,12 @@ class TestMissingSourceDocuments(TestSourceDirs):
def test_init_missing(self):
missing = os.path.join(self.tempdir, 'vanishing')
with self.assertRaises(OSError) as ecm:
with self.assertRaises(IOError) as ecm:
SourceDocument(missing)
e = ecm.exception
self.assertTrue('Missing' in e.message)
self.assertEquals(errno.ENOENT, e.errno)
with self.assertRaises(OSError) as ecm:
with self.assertRaises(TypeError) as ecm:
SourceDocument(self.tempdir)
e = ecm.exception
self.assertTrue('Wrong type' in e.message)

5
tldp/sources.py
View File

@ -3,6 +3,7 @@
from __future__ import absolute_import, division, print_function
import os
import errno
from .utils import logger
from .typeguesser import guess, knownextensions
@ -26,7 +27,7 @@ class SourceDirs(object):
if not all(results):
for result, sdir in zip(results, self.sourcedirs):
logger.critical("Directory does not exist: " + sdir)
raise OSError(errno.ENOENT, os.strerror(errno.ENOENT), sdir)
raise IOError(errno.ENOENT, os.strerror(errno.ENOENT), sdir)
def enumerateDocuments(self):
for sdir in self.sourcedirs:
@ -57,7 +58,7 @@ class SourceDocument(object):
self.filename = os.path.abspath(filename)
if not os.path.exists(self.filename):
logger.critical("Missing source document: %s", self.filename)
raise OSError(errno.ENOENT, os.strerror(errno.ENOENT), self.filename)
raise IOError(errno.ENOENT, os.strerror(errno.ENOENT), self.filename)
if not os.path.isfile(self.filename):
logger.critical("Source document is not a plain file: %s", self.filename)
raise TypeError("Wrong type, not a plain file: " + self.filename)