Add assert in tests to validate whether outputFile already exists.

andrewferrier · Mar 16, 2015 · 7ff3cd3 · 7ff3cd3
1 parent bce15a3
commit 7ff3cd3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/tests/BaseTestClasses.py b/tests/BaseTestClasses.py
@@ -109,7 +109,7 @@ def addHeaders(self, frm=DEFAULT_FROM, to=DEFAULT_TO, subject=DEFAULT_SUBJECT):
 
         self.msg['Date'] = formatdate()
 
-    def invokeAsSubprocess(self, inputFile=False, outputDirectory=None, outputFile=None, extraParams=[], expectOutput=False):
+    def invokeAsSubprocess(self, inputFile=False, outputDirectory=None, outputFile=None, extraParams=[], expectOutput=False, okToExist=False):
         bytesMessage = self.msg.as_bytes()
 
         options = [Email2PDFTestCase.COMMAND]
@@ -130,6 +130,8 @@ def invokeAsSubprocess(self, inputFile=False, outputDirectory=None, outputFile=N
 
         if outputFile:
             options.extend(['-o', outputFile])
+            if not okToExist:
+                assert(not os.path.exists(outputFile))
 
         options.extend(extraParams)
 

diff --git a/tests/Subprocess/test_Subprocess_Basic.py b/tests/Subprocess/test_Subprocess_Basic.py
@@ -113,7 +113,7 @@ def test_plaincontent_outputfileoverrides(self):
     def test_plaincontent_fileexist(self):
         self.setPlainContent("Hello!")
         with tempfile.NamedTemporaryFile() as tmpfile:
-            (rc, output, error) = self.invokeAsSubprocess(outputFile=tmpfile.name)
+            (rc, output, error) = self.invokeAsSubprocess(outputFile=tmpfile.name, okToExist=True)
             self.assertEqual(2, rc)
             self.assertRegex(error, "file.*exist")