Merge lp://staging/~cmiller/desktopcouch/service-exits-properly into lp://staging/desktopcouch
Proposed by
Chad Miller
Status: | Merged |
---|---|
Approved by: | dobey |
Approved revision: | 276 |
Merged at revision: | 275 |
Proposed branch: | lp://staging/~cmiller/desktopcouch/service-exits-properly |
Merge into: | lp://staging/desktopcouch |
Diff against target: |
98 lines (+28/-7) 2 files modified
desktopcouch/application/service.py (+23/-6) desktopcouch/application/tests/test_service.py (+5/-1) |
To merge this branch: | bzr merge lp://staging/~cmiller/desktopcouch/service-exits-properly |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
dobey (community) | Approve | ||
Eric Casteleijn (community) | Approve | ||
Review via email: mp+58964@code.staging.launchpad.net |
Commit message
Shut down every child when service exits. On SIGTERM or SIGHUP, exit gracefully. (LP: 597197)
To post a comment you must log in.
The attempt to merge lp:~cmiller/desktopcouch/service-exits-properly into lp:desktopcouch failed. Below is the output from the failed tests.
Apache CouchDB has started, time to relax. /tmp/tmpaiH_ vP/data/ couchdb. html application. migration. tests.test_ migration migration_ deleted_ flag_to_ trash ... Traceback (most recent call last): python2. 7/unittest/ case.py" , line 312, in run otto/tarmac- builds/ desktopcouch/ trunk/desktopco uch/application /migration/ tests/test_ migration. py", line 105, in setUp TestMigration, self).setUp() otto/tarmac- builds/ desktopcouch/ trunk/desktopco uch/application /migration/ tests/test_ migration. py", line 57, in setUp (self.dbname, create=True, ctx=self.ctx) otto/tarmac- builds/ desktopcouch/ trunk/desktopco uch/application /server. py", line 75, in __init__ tokens= oauth_tokens, ctx=ctx, views_factory= views_factory) otto/tarmac- builds/ desktopcouch/ trunk/desktopco uch/records/ database. py", line 123, in __init__ _reconnect( ) otto/tarmac- builds/ desktopcouch/ trunk/desktopco uch/application /server. py", line 85, in _reconnect DesktopDatabase , self)._ reconnect( uri=uri) otto/tarmac- builds/ desktopcouch/ trunk/desktopco uch/records/ database. py", line 139, in _reconnect _server. create( self._database_ name) pymodules/ python2. 7/couchdb/ client. py", line 193, in create resource. put_json( validate_ dbname( name)) pymodules/ python2. 7/couchdb/ http.py" , line 405, in put_json pymodules/ python2. 7/couchdb/ http.py" , line 384, in put 'PUT', path, body=body, headers=headers, **params) pymodules/ python2. 7/couchdb/ http.py" , line 419, in _request =self.credentia ls) otto/tarmac- builds/ desktopcouch/ trunk/desktopco uch/records/ http.py" , line 259, in request (status, error)) http.ServerErro r: (400, ('invalid_ consumer_ token_pair' , 'Invalid consumer and token pair.')) migration_ in_face_ of_broken_ records ... Traceback (most recent call last): python2. 7/unittest/ case.py" , line 312, in run otto/tarmac- builds/ desktopcouch/ trunk/desktopco uch/application /migration/ tests/test_ migration. py", line 105, in setUp TestMigration, self).setUp() otto/tarmac- builds/ desktopcouch/ trunk/desktopco uch/application /migration/ tests/test_ migration. py", line 57, in setUp (self.dbname, create=True, ctx=self.ctx) otto/tarmac- builds/ desktopcouch/ trunk/desktopco uch/application /server. py", line 75, in __init__ tokens= oauth_tokens, ctx=ctx, views_factory= views_factory) otto/tarmac- builds/ desktopcouch/ trunk/desktopco uch/records/ database. py", line 123, in __init__ _reconnect( ) otto/tarmac- builds/ desktopcouch/ trunk/desktopco uch/application /server. py", l...
Browse your desktop CouchDB at file://
desktopcouch.
TestMigration
test_
File "/usr/lib/
self.setUp()
File "/home/
super(
File "/home/
self.database = DesktopDatabase
File "/home/
oauth_
File "/home/
self.
File "/home/
super(
File "/home/
self.
File "/usr/lib/
self.
File "/usr/lib/
status, headers, data = self.put(*a, **k)
File "/usr/lib/
return self._request(
File "/usr/lib/
credentials
File "/home/
raise ServerError(
couchdb.
[ERROR]
test_
File "/usr/lib/
self.setUp()
File "/home/
super(
File "/home/
self.database = DesktopDatabase
File "/home/
oauth_
File "/home/
self.
File "/home/