Merge ~emitorino/qa-regression-testing:test_daemon_update into qa-regression-testing:master
Status: | Merged |
---|---|
Merge reported by: | Emilia Torino |
Merged at revision: | 19870f834d5dba23400e5755118e42dc2867cfa1 |
Proposed branch: | ~emitorino/qa-regression-testing:test_daemon_update |
Merge into: | qa-regression-testing:master |
Diff against target: |
1253 lines (+71/-443) 25 files modified
dev/null (+0/-349) scripts/test-acpid.py (+1/-1) scripts/test-apport.py (+1/-1) scripts/test-bind9.py (+3/-3) scripts/test-cron.py (+1/-1) scripts/test-dnsmasq.py (+1/-1) scripts/test-freeradius.py (+1/-1) scripts/test-fuse.py (+1/-1) scripts/test-haproxy.py (+1/-1) scripts/test-libfs.py (+1/-1) scripts/test-mailman.py (+2/-2) scripts/test-memcached.py (+1/-1) scripts/test-mono-xsp.py (+1/-1) scripts/test-nagios3.py (+2/-2) scripts/test-nginx.py (+1/-1) scripts/test-open-iscsi.py (+1/-1) scripts/test-openslp.py (+1/-2) scripts/test-postgresql.py (+5/-5) scripts/test-puppet.py (+2/-2) scripts/test-rabbitmq-server.py (+1/-1) scripts/test-rsync.py (+1/-1) scripts/test-tomcat.py (+6/-12) scripts/test-vsftpd.py (+1/-1) scripts/test-zope3.py (+1/-1) scripts/testlib.py (+34/-50) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Steve Beattie (community) | Approve | ||
Review via email:
|
Commit message
Updating testlib.TestDaemon to use service if present in /usr/sbin/service but fallback to init script if not.
Description of the change
* Moving /etc/init.d to this class instead, so consumers just mention the service name
* Given most actions had same code to run the command, a new method was created to avoid duplicated code
* Did not update HttpdCommon as part of this change, can be done later
* This tests are failing, still trying to understand the root cause (wont merge until confirming failing reasons)
test-fuse.py
test-libfs
test-mailman
test-nagios
test-mono-xsp
test-open-iscsi.py
test-puppet.py
test-rsync.py
test-vsftpd.py
test-zope3.py
test-postgresql-8.4 (on precise)
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
nagios and nagios2 were superceded by nagios3 and removed from the ubuntu archive a long time ago (publishing histories are https:/ /launchpad. net/ubuntu/ +source/ nagios/ +publishinghist ory and https:/ /launchpad. net/ubuntu/ +source/ nagios2/ +publishinghist ory resepctively). We can just kill the respective test scripts.