mwalbeck/email2pdf
1
0
Fork 0
forked from archive/andrewferrier_email2pdf
Code Pull requests Activity

Add unit tests for verbose parameters.

Browse source
This commit is contained in:
Andrew Ferrier 2014-10-12 15:34:19 +01:00
parent 9c638b2629
commit bea64650df
2 changed files with 23 additions and 15 deletions

16
email2pdf
View file

@ -45,13 +45,13 @@ def main():
if args.verbose > 1:
sysLogHandler.setLevel(logging.DEBUG)
sysOutHandler.setLevel(logging.DEBUG)
sysErrHandler.setLevel(logging.DEBUG)
elif args.verbose == 1:
sysLogHandler.setLevel(logging.DEBUG)
sysOutHandler.setLevel(logging.INFO)
sysErrHandler.setLevel(logging.INFO)
else:
sysLogHandler.setLevel(logging.INFO)
sysOutHandler.setLevel(logging.WARNING)
sysErrHandler.setLevel(logging.WARNING)
output_directory = os.path.normpath(args.outputDirectory)
@ -238,11 +238,11 @@ sysLogFormatter = logging.Formatter('%(pathname)s[' + str(os.getpid()) + '] %(le
sysLogHandler.setFormatter(sysLogFormatter)
logger.addHandler(sysLogHandler)
sysOutHandler = logging.StreamHandler(stream = sys.stderr)
sysOutHandler.setLevel(logging.WARNING)
sysOutFormatter = logging.Formatter('%(levelname)s: %(message)s')
sysOutHandler.setFormatter(sysOutFormatter)
logger.addHandler(sysOutHandler)
sysErrHandler = logging.StreamHandler(stream = sys.stderr)
sysErrHandler.setLevel(logging.WARNING)
sysErrFormatter = logging.Formatter('%(levelname)s: %(message)s')
sysErrHandler.setFormatter(sysErrFormatter)
logger.addHandler(sysErrHandler)
if __name__ == "__main__":
main()

22
email2pdf_unittest
View file

@ -57,20 +57,20 @@ class BaseTestClasses:
self.msg['Date'] = formatdate()
def invokeEmail2PDF(self, headers=False, outputDirectory=DEFAULT_OUTPUT_DIR, errorExpected=False, outputFile=None):
def invokeEmail2PDF(self, outputDirectory=DEFAULT_OUTPUT_DIR, sysErrExpected=False, outputFile=None,
extraParams=[]):
textMessage = self.msg.as_string()
options = ['./email2pdf', '-d', outputDirectory]
if headers:
options.append('--headers')
if outputFile:
options.append('-o')
options.append(outputFile)
options.extend(sys.argv[1:])
options.extend(extraParams)
if errorExpected:
if sysErrExpected:
p = Popen(options, stdin=PIPE, stderr=error_log)
else:
p = Popen(options, stdin=PIPE)
@ -147,7 +147,7 @@ class TestBasic(BaseTestClasses.Email2PDFTestCase):
def test_plaincontent_headers(self):
self.addHeaders("From", "To", "Subject")
self.setPlainContent("Hello!")
self.assertEqual(self.invokeEmail2PDF(headers=True), 0)
self.assertEqual(self.invokeEmail2PDF(extraParams=['--headers']), 0)
self.assertTrue(self.existsByTime())
def test_plaincontent_trailingslash(self):
@ -157,16 +157,24 @@ class TestBasic(BaseTestClasses.Email2PDFTestCase):
def test_plaincontent_dirnotexist(self):
self.setPlainContent("Hello!")
self.assertNotEqual(self.invokeEmail2PDF(outputDirectory="/notexist/", errorExpected=True), 0)
self.assertNotEqual(self.invokeEmail2PDF(outputDirectory="/notexist/", sysErrExpected=True), 0)
def test_plaincontent_fileexist(self):
self.setPlainContent("Hello!")
unused_f_handle, f_path = tempfile.mkstemp()
try:
self.assertNotEqual(self.invokeEmail2PDF(outputFile=f_path, errorExpected=True), 0)
self.assertNotEqual(self.invokeEmail2PDF(outputFile=f_path, sysErrExpected=True), 0)
finally:
os.unlink(f_path)
def test_verbose(self):
self.setPlainContent("Hello!")
self.assertEqual(self.invokeEmail2PDF(extraParams=['-v'], sysErrExpected=True), 0)
def test_veryverbose(self):
self.setPlainContent("Hello!")
self.assertEqual(self.invokeEmail2PDF(extraParams=['-vv'], sysErrExpected=True), 0)
class TestMIME(BaseTestClasses.Email2PDFTestCase):
def setUp(self):