Merge lp://qastaging/~yolanda.robla/ubuntu/saucy/squid3/fix-squid3-startstop into lp://qastaging/ubuntu/saucy/squid3

Proposed by Yolanda Robla
Status: Merged
Merged at revision: 47
Proposed branch: lp://qastaging/~yolanda.robla/ubuntu/saucy/squid3/fix-squid3-startstop
Merge into: lp://qastaging/ubuntu/saucy/squid3
Diff against target: 77 lines (+27/-8)
3 files modified
debian/changelog (+6/-0)
debian/tests/test-squid.py (+1/-1)
debian/tests/testlib_httpd.py (+20/-7)
To merge this branch: bzr merge lp://qastaging/~yolanda.robla/ubuntu/saucy/squid3/fix-squid3-startstop
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+167804@code.qastaging.launchpad.net

Description of the change

Fix squid3 start/stop

To post a comment you must log in.
47. By Yolanda Robla

debian/tests: modified start/stop squid3

Revision history for this message
Martin Pitt (pitti) wrote :

Thanks that fixes the tests indeed. However, I spotted this:

53 + # check if process is running
54 + rc, pidof = testlib.cmd(['pidof', '-x', self.initscript])

The init.d script will only actuall run for a very brief period of time, and the upstart script will never run at all. Doesn't this want to check "pidof squid" or something like that, i. e. check for the actual daemon?

32 def _start(self):
33 '''Start httpd'''

That looks like a copy&paste error, same in _stop(). Can you please adjust the docstring to avoid confusion? Or is that really apache, and the changelog should say "apache", not "squid"?

48. By Yolanda Robla

fixes in start/stop

Revision history for this message
Yolanda Robla (yolanda.robla) wrote :

pushed new revision, recheck

Revision history for this message
Martin Pitt (pitti) wrote :

Looks good, thank you!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: