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

[Sergio Durigan Junior]

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

[Steve Beattie (sbeattie)]

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

Thanks!

review: Approve

diff --git a/scripts/test-squid.py b/scripts/test-squid.py
index a7020ed..48ba167 100755
--- a/scripts/test-squid.py
+++ b/scripts/test-squid.py
@@ -201,7 +201,10 @@ class BasicTest(testlib_httpd.HttpdCommon, PrivateSquidTest):
         '''Test daemon'''
 
         if self.lsb_release['Release'] >= 16.04:
-            pidfile = "/run/squid.pid"
+            if self.lsb_release['Release'] >= 20.10:
+                pidfile = "/run/squid/squid.pid"
+            else:
+                pidfile = "/run/squid.pid"
         else:
             pidfile = "/run/squid3.pid"