Merge lp://staging/~canonical-platform-qa/ubuntu-ota-tests/check-for-running-service into lp://staging/ubuntu-ota-tests
Status: | Merged |
---|---|
Approved by: | Christopher Lee |
Approved revision: | 12 |
Merged at revision: | 3 |
Proposed branch: | lp://staging/~canonical-platform-qa/ubuntu-ota-tests/check-for-running-service |
Merge into: | lp://staging/ubuntu-ota-tests |
Diff against target: |
212 lines (+183/-2) 5 files modified
debian/tests/control (+4/-2) debian/tests/ubuntu_ota_tests/__init__.py (+27/-0) debian/tests/ubuntu_ota_tests/selftests/test_services.py (+32/-0) debian/tests/ubuntu_ota_tests/services.py (+86/-0) debian/tests/ubuntu_ota_tests/system.py (+34/-0) |
To merge this branch: | bzr merge lp://staging/~canonical-platform-qa/ubuntu-ota-tests/check-for-running-service |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Christopher Lee (community) | Approve | ||
Leo Arias (community) | Approve | ||
Barry Warsaw (community) | Needs Fixing | ||
Review via email: mp+252057@code.staging.launchpad.net |
Commit message
Add script for ensuring the system-image-dbus process is not running.
Description of the change
Add script for ensuring the system-image-dbus process is not running.
Perhaps there is a better way to have the support scripts instead of in the d/tests/ dir. SHould they instead be packaged up in ubuntu-ota-tests so that they can be consumed outside of the dep8 tests?
Also, note that the is a simple workable case in revno 4 where it just catches the dbus exception, I added the use of checking for the running of the process (check with psutil) but that adds a Depends: python3-psutil meaning the test setup will take a little longer.
Also, also :-) I don't think the test that I have there will stay, it's purely there as a stand-in for now.
Comments inline.
I like the way you've created a package for utilities to live in. We should definitely do that. Also, I think it's perfectly fine to import things from the systemimage package. There's a lot of useful utilities there, such as systemimage. reactor. Reactor, and since this is the SUT, I think it's perfectly acceptable to use them when appropriate.
(Note, in the case where you locate the system-image-dbus process, si has a similar utility, but it's semantics are somewhat different, so it's not a perfect fit.)