summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiana Clarke <diana.joan.clarke@gmail.com>2012-03-15 00:24:46 -0400
committerDiana Clarke <diana.joan.clarke@gmail.com>2012-03-15 04:45:07 +0000
commit8c2aaf80c470511de08d2fa7b66f0f635e55eff7 (patch)
tree167d5a844bc6d2916429514af8f3f3b9f277ba15
parentd3941838a61c0dc96bc2b6209bfcfdf77ea6b834 (diff)
downloadpyramid-8c2aaf80c470511de08d2fa7b66f0f635e55eff7.tar.gz
pyramid-8c2aaf80c470511de08d2fa7b66f0f635e55eff7.tar.bz2
pyramid-8c2aaf80c470511de08d2fa7b66f0f635e55eff7.zip
removing another # pragma: no cover
- test coverage still reports 100% should probably clean up the temp file
-rw-r--r--pyramid/scripts/pserve.py7
-rw-r--r--pyramid/tests/test_scripts/test_pserve.py23
2 files changed, 26 insertions, 4 deletions
diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py
index dcc095d1a..ea2a4ae09 100644
--- a/pyramid/scripts/pserve.py
+++ b/pyramid/scripts/pserve.py
@@ -628,12 +628,11 @@ def live_pidfile(pidfile): # pragma: no cover
return pid
return None
-def read_pidfile(filename): # pragma: no cover
+def read_pidfile(filename):
if os.path.exists(filename):
try:
- f = open(filename)
- content = f.read()
- f.close()
+ with open(filename) as f:
+ content = f.read()
return int(content.strip())
except (ValueError, IOError):
return None
diff --git a/pyramid/tests/test_scripts/test_pserve.py b/pyramid/tests/test_scripts/test_pserve.py
index 1b45a5d90..d7b252d92 100644
--- a/pyramid/tests/test_scripts/test_pserve.py
+++ b/pyramid/tests/test_scripts/test_pserve.py
@@ -204,6 +204,29 @@ class TestPServeCommand(unittest.TestCase):
inst = self._makeOne('development.ini')
self.assertRaises(ValueError, inst.parse_vars, vars)
+class Test_read_pidfile(unittest.TestCase):
+ def _callFUT(self, filename):
+ from pyramid.scripts.pserve import read_pidfile
+ return read_pidfile(filename)
+
+ def test_read_pidfile(self):
+ filename = tempfile.mktemp()
+ try:
+ with open(filename, 'w') as f:
+ f.write('12345')
+ result = self._callFUT(filename)
+ self.assertEqual(result, 12345)
+ finally:
+ os.remove(filename)
+
+ def test_read_pidfile_no_pid_file(self):
+ result = self._callFUT('some unknown path')
+ self.assertEqual(result, None)
+
+ def test_read_pidfile_not_a_number(self):
+ result = self._callFUT(__file__)
+ self.assertEqual(result, None)
+
class Test_main(unittest.TestCase):
def _callFUT(self, argv):
from pyramid.scripts.pserve import main