Merge lp://qastaging/~cmiller/desktopcouch/get-port-through-dbus-again into lp://qastaging/desktopcouch
- get-port-through-dbus-again
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Chad Miller |
Approved revision: | 192 |
Merged at revision: | 232 |
Proposed branch: | lp://qastaging/~cmiller/desktopcouch/get-port-through-dbus-again |
Merge into: | lp://qastaging/desktopcouch |
Diff against target: |
51 lines (+12/-17) 2 files modified
desktopcouch/application/migration/tests/test_migration.py (+4/-0) desktopcouch/application/platform/linux/__init__.py (+8/-17) |
To merge this branch: | bzr merge lp://qastaging/~cmiller/desktopcouch/get-port-through-dbus-again |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chad Miller (community) | Approve | ||
Vincenzo Di Somma (community) | Approve | ||
Eric Casteleijn (community) | Approve | ||
Review via email:
|
Commit message
Again get port from DBus. The only client (AFAIK) that experienced the problem in the deleted comment was Gwibber. (LP: #519028)
Description of the change
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Vincenzo Di Somma (vds) : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
dobey (dobey) wrote : | # |
Attempt to merge into lp:desktopcouch failed due to conflicts:
text conflict in desktopcouch/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
dobey (dobey) wrote : | # |
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
dobey (dobey) wrote : | # |
The attempt to merge lp:~cmiller/desktopcouch/get-port-through-dbus-again into lp:desktopcouch failed. Below is the output from the failed tests.
running build
running build_py
creating build
creating build/lib.
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
dobey (dobey) wrote : | # |
The attempt to merge lp:~cmiller/desktopcouch/get-port-through-dbus-again into lp:desktopcouch failed. Below is the output from the failed tests.
running build
running build_py
creating build
creating build/lib.
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
dobey (dobey) wrote : | # |
The attempt to merge lp:~cmiller/desktopcouch/get-port-through-dbus-again into lp:desktopcouch failed. Below is the output from the failed tests.
running build
running build_py
creating build
creating build/lib.
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
dobey (dobey) wrote : | # |
The attempt to merge lp:~cmiller/desktopcouch/get-port-through-dbus-again into lp:desktopcouch failed. Below is the output from the failed tests.
running build
running build_py
creating build
creating build/lib.
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
dobey (dobey) wrote : | # |
Attempt to merge into lp:desktopcouch failed due to conflicts:
text conflict in desktopcouch/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
dobey (dobey) wrote : | # |
The attempt to merge lp:~cmiller/desktopcouch/get-port-through-dbus-again into lp:desktopcouch failed. Below is the output from the failed tests.
running build
running build_py
creating build
creating build/lib.
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
The attempt to merge lp:~cmiller/desktopcouch/get-port-through-dbus-again into lp:desktopcouch failed. Below is the output from the failed tests.
Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
desktopcouch.
TestUpdateDes
test_
desktopcouch.
TestService
test_
test_
test_
desktopcouch.
TestKeyringIn
test_with_auth ... [OK]
test_
TestLocalFiles
test_
test_
test_
test_
desktopcouch.
TestReplication
test_creation ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
TestUbuntuone
test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
desktopcouch.
TestMigration
test_
test_
test_
TestRegistration
test_
desktopcouch.
TestKeyring
test_
test_
test_
test_
desktopcouch.
TestCouchdbIo
test_
test_
test_mkuri ... [OK]
test_
test_
test_
desktopcouch.
TestUbunton...
- 190. By Chad Miller
-
merge trunk
- 191. By Chad Miller
-
Repair missing import from previous patch.
- 192. By Chad Miller
-
Fix bogus test failure where other tests polluted deleted-record test.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Chad Miller (cmiller) : | # |
looks great, tests pass.