Merge ~sergiodj/qa-regression-testing:squid-pidfile-groovy into qa-regression-testing:master

Proposed by Sergio Durigan Junior
Status: Merged
Merged at revision: fc32e5b48a7942f8880661c3f7ae0c32d0ab4901
Proposed branch: ~sergiodj/qa-regression-testing:squid-pidfile-groovy
Merge into: qa-regression-testing:master
Diff against target: 15 lines (+4/-1)
1 file modified
scripts/test-squid.py (+4/-1)
Reviewer Review Type Date Requested Status
Steve Beattie Approve
Review via email: mp+384046@code.launchpad.net

Description of the change

Update test-squid.py to accomodate the change to pidfile pathname that will be shipped in groovy.

To post a comment you must log in.
Revision history for this message
Steve Beattie (sbeattie) wrote :

LGTM, I merged your fix, after adjusting the logic (and similar logic that followed it) to not nest so deep.

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/scripts/test-squid.py b/scripts/test-squid.py
2index a7020ed..48ba167 100755
3--- a/scripts/test-squid.py
4+++ b/scripts/test-squid.py
5@@ -201,7 +201,10 @@ class BasicTest(testlib_httpd.HttpdCommon, PrivateSquidTest):
6 '''Test daemon'''
7
8 if self.lsb_release['Release'] >= 16.04:
9- pidfile = "/run/squid.pid"
10+ if self.lsb_release['Release'] >= 20.10:
11+ pidfile = "/run/squid/squid.pid"
12+ else:
13+ pidfile = "/run/squid.pid"
14 else:
15 pidfile = "/run/squid3.pid"
16

Subscribers

People subscribed via source and target branches