Merge pull request #2 from knsd/master

Fixed tests for travis ci

tests/daemon_keep_fds.py

@@ -1,13 +1,15 @@
 #!/usr/bin/env python
 
 import logging
+from sys import argv
+
 from daemonize import Daemonize
 
-pid = "/tmp/test.pid"
+pid = argv[1]
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
 logger.propagate = False
-fh = logging.FileHandler("/tmp/test.log", "w")
+fh = logging.FileHandler(argv[2], "w")
 fh.setLevel(logging.DEBUG)
 logger.addHandler(fh)
 keep_fds = [fh.stream.fileno()]

tests/daemon_sigterm.py

@@ -1,9 +1,11 @@
 #!/usr/bin/env python
 
+from sys import argv
 from time import sleep
+
 from daemonize import Daemonize
 
-pid = "/tmp/test.pid"
+pid = argv[1]
 
 
 def main():

tests/test.py

@@ -1,13 +1,15 @@
 import unittest
 import os
 import subprocess
+
+from tempfile import mkstemp
 from time import sleep
 
 
 class DaemonizeTest(unittest.TestCase):
     def setUp(self):
-        self.pidfile = "/tmp/test.pid"
+        self.pidfile = mkstemp()[1]
-        os.system("python tests/daemon_sigterm.py")
+        os.system("python tests/daemon_sigterm.py %s" % self.pidfile)
         sleep(.1)
 
     def tearDown(self):
@@ -32,10 +34,10 @@ class DaemonizeTest(unittest.TestCase):
 
 class KeepFDsTest(unittest.TestCase):
     def setUp(self):
-        self.pidfile = "/tmp/test.pid"
+        self.pidfile = mkstemp()[1]
-        self.logfile = "/tmp/test.log"
+        self.logfile = mkstemp()[1]
-        os.system("python tests/daemon_keep_fds.py")
+        os.system("python tests/daemon_keep_fds.py %s %s" % (self.pidfile, self.logfile))
-        sleep(.1)
+        sleep(1)
 
     def tearDown(self):
         os.system("kill `cat %s`" % self.pidfile)