From 6f5b790b67bf8ce637aea720561891a68ebefd31 Mon Sep 17 00:00:00 2001 From: Fedor Gogolev Date: Sun, 24 Mar 2013 02:56:38 +0400 Subject: [PATCH 1/2] Maybe fixed tests --- tests/daemon_keep_fds.py | 6 ++++-- tests/daemon_sigterm.py | 4 +++- tests/test.py | 12 +++++++----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/tests/daemon_keep_fds.py b/tests/daemon_keep_fds.py index 132eecd..97b2d99 100644 --- a/tests/daemon_keep_fds.py +++ b/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()] diff --git a/tests/daemon_sigterm.py b/tests/daemon_sigterm.py index 1febb4e..b0b34ce 100644 --- a/tests/daemon_sigterm.py +++ b/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(): diff --git a/tests/test.py b/tests/test.py index 07d876b..86ee418 100644 --- a/tests/test.py +++ b/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" - os.system("python tests/daemon_sigterm.py") + self.pidfile = mkstemp()[1] + os.system("python tests/daemon_sigterm.py %s" % self.pidfile) sleep(.1) def tearDown(self): @@ -32,9 +34,9 @@ class DaemonizeTest(unittest.TestCase): class KeepFDsTest(unittest.TestCase): def setUp(self): - self.pidfile = "/tmp/test.pid" - self.logfile = "/tmp/test.log" - os.system("python tests/daemon_keep_fds.py") + self.pidfile = mkstemp()[1] + self.logfile = mkstemp()[1] + os.system("python tests/daemon_keep_fds.py %s %s" % (self.pidfile, self.logfile)) sleep(.1) def tearDown(self): From 563b3530cd8ed0331171a117b6d8d207d7209102 Mon Sep 17 00:00:00 2001 From: Fedor Gogolev Date: Sun, 24 Mar 2013 18:20:23 +0400 Subject: [PATCH 2/2] Maybe travis ci is not enough fast --- tests/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test.py b/tests/test.py index 86ee418..5aeba30 100644 --- a/tests/test.py +++ b/tests/test.py @@ -37,7 +37,7 @@ class KeepFDsTest(unittest.TestCase): self.pidfile = mkstemp()[1] self.logfile = mkstemp()[1] 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)