Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removing another # pragma: no cover #488

Merged
merged 1 commit into from Mar 15, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions pyramid/scripts/pserve.py
Expand Up @@ -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
Expand Down
23 changes: 23 additions & 0 deletions pyramid/tests/test_scripts/test_pserve.py
Expand Up @@ -204,6 +204,29 @@ def test_parse_vars_bad(self):
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
Expand Down