Merge lp:~mardy/online-accounts-api/timeout-1603706 into lp:online-accounts-api
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | James Henstridge | ||||
Approved revision: | 24 | ||||
Merged at revision: | 24 | ||||
Proposed branch: | lp:~mardy/online-accounts-api/timeout-1603706 | ||||
Merge into: | lp:online-accounts-api | ||||
Diff against target: |
255 lines (+68/-44) 3 files modified
tests/daemon/functional_tests/daemon_interface.cpp (+2/-2) tests/daemon/functional_tests/daemon_interface.h (+1/-1) tests/daemon/functional_tests/functional_tests.cpp (+65/-41) |
||||
To merge this branch: | bzr merge lp:~mardy/online-accounts-api/timeout-1603706 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Henstridge | Approve | ||
Review via email: mp+300416@code.launchpad.net |
Commit message
Tests: keep the service alive while running the test
On slower machines, the D-Bus service can timeout during the execution of the testAccountChan
With this change each test is run in its own D-Bus session, with a 30 seconds timeout, and only the testLifetime() has a shorter timeout, needed to test the auto-quitting functionality.
Description of the change
Tests: keep the service alive while running the test
On slower machines, the D-Bus service can timeout during the execution of the testAccountChan
With this change each test is run in its own D-Bus session, with a 30 seconds timeout, and only the testLifetime() has a shorter timeout, needed to test the auto-quitting functionality.
There were two failed builds with this MP added to the silo. I've left details about them in the attached bug report together with links to the build logs:
https:/ /bugs.launchpad .net/ubuntu/ +source/ online- accounts- api/+bug/ 1603706/ comments/ 3