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

[Yolanda Robla]

Fix squid3 start/stop

[lp:~yolanda.robla/ubuntu/saucy/squid3/fix-squid3-startstop]

47. By Yolanda Robla on 2013-06-06

debian/tests: modified start/stop squid3

[Martin Pitt (pitti)]

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"?

[lp:~yolanda.robla/ubuntu/saucy/squid3/fix-squid3-startstop]

48. By Yolanda Robla on 2013-06-07

fixes in start/stop

[Yolanda Robla (yolanda.robla)]

pushed new revision, recheck

[Martin Pitt (pitti)]

Looks good, thank you!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-27 12:50:14 +0000
+++ debian/changelog	2013-06-07 09:47:20 +0000
@@ -1,3 +1,9 @@
+squid3 (3.1.20-1ubuntu6) UNRELEASED; urgency=low
+
+  * debian/tests: modified start/stop squid3
+
+ -- Yolanda Robla <[e-mail]>  Thu, 06 Jun 2013 18:21:48 +0200
+
 squid3 (3.1.20-1ubuntu5) saucy; urgency=low
 
   * debian/rules: fix FTBFS, removed --with-cppunit-basedir flag

=== modified file 'debian/tests/test-squid.py'
--- debian/tests/test-squid.py	2013-05-24 10:56:53 +0000
+++ debian/tests/test-squid.py	2013-06-07 09:47:20 +0000
@@ -95,7 +95,7 @@
 
         self._set_initscript("/etc/init.d/squid")
         if self.lsb_release['Release'] >= 12.04:
-            self._set_initscript("/etc/init.d/squid3")
+            self._set_initscript("squid3")
 
         testlib_httpd.HttpdCommon._setUp(self)
 

=== modified file 'debian/tests/testlib_httpd.py'
--- debian/tests/testlib_httpd.py	2013-05-24 10:56:53 +0000
+++ debian/tests/testlib_httpd.py	2013-06-07 09:47:20 +0000
@@ -47,7 +47,7 @@
         self.access_log = "/var/log/apache2/access.log"
         self.error_log = "/var/log/apache2/error.log"
         if not hasattr(self, 'initscript'):
-            self._set_initscript("/etc/init.d/apache2")
+            self._set_initscript("apache2")
 
         # Dapper's apache2 is disabled by default
         if self.lsb_release['Release'] == 6.06:
@@ -83,18 +83,31 @@
         testlib.config_restore(self.apache2_default)
 
     def _start(self):
-        '''Start httpd'''
-        #print self.initscript,"start"
-        rc, report = testlib.cmd([self.initscript, 'start'])
+        '''Start process'''
+        # check if there is a /etc/init/initscript.conf
+        if os.path.exists("/etc/init/%s.conf" % self.initscript):
+            rc, report = testlib.cmd(['start', self.initscript])
+        else:
+            rc, report = testlib.cmd(["/etc/init.d/%s" % self.initscript, 'start'])
+
         expected = 0
         result = 'Got exit code %d, expected %d\n' % (rc, expected)
         self.assertEquals(expected, rc, result + report)
         time.sleep(2)
 
     def _stop(self):
-        '''Stop httpd'''
-        #print self.initscript,"stop"
-        rc, report = testlib.cmd([self.initscript, 'stop'])
+        '''Stop process'''
+        # check if process is running
+        if os.path.exists("/etc/init/%s.conf" % self.initscript):
+            rc, pidof = testlib.cmd(['pidof', '-x', self.initscript])
+            if pidof:
+                rc, report = testlib.cmd(['stop', self.initscript])
+            else:
+                # no need to stop it, it's stopped
+                rc, report = (0, '')
+        else:
+            rc, report = testlib.cmd([self.initscript, 'stop'])
+
         expected = 0
         result = 'Got exit code %d, expected %d\n' % (rc, expected)
         self.assertEquals(expected, rc, result + report)