Merge lp://qastaging/~cmiller/desktopcouch/service-exits-properly into lp://qastaging/desktopcouch

Proposed by Chad Miller
Status: Merged
Approved by: dobey
Approved revision: 276
Merged at revision: 275
Proposed branch: lp://qastaging/~cmiller/desktopcouch/service-exits-properly
Merge into: lp://qastaging/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://qastaging/~cmiller/desktopcouch/service-exits-properly
Reviewer Review Type Date Requested Status
dobey (community) Approve
Eric Casteleijn (community) Approve
Review via email: mp+58964@code.qastaging.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.
Revision history for this message
Eric Casteleijn (thisfred) :
review: Approve
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (119.4 KiB)

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.
Browse your desktop CouchDB at file:///tmp/tmpaiH_vP/data/couchdb.html
desktopcouch.application.migration.tests.test_migration
  TestMigration
    test_migration_deleted_flag_to_trash ... Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 312, in run
    self.setUp()
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/application/migration/tests/test_migration.py", line 105, in setUp
    super(TestMigration, self).setUp()
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/application/migration/tests/test_migration.py", line 57, in setUp
    self.database = DesktopDatabase(self.dbname, create=True, ctx=self.ctx)
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/application/server.py", line 75, in __init__
    oauth_tokens=oauth_tokens, ctx=ctx, views_factory=views_factory)
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/records/database.py", line 123, in __init__
    self._reconnect()
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/application/server.py", line 85, in _reconnect
    super(DesktopDatabase, self)._reconnect(uri=uri)
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/records/database.py", line 139, in _reconnect
    self._server.create(self._database_name)
  File "/usr/lib/pymodules/python2.7/couchdb/client.py", line 193, in create
    self.resource.put_json(validate_dbname(name))
  File "/usr/lib/pymodules/python2.7/couchdb/http.py", line 405, in put_json
    status, headers, data = self.put(*a, **k)
  File "/usr/lib/pymodules/python2.7/couchdb/http.py", line 384, in put
    return self._request('PUT', path, body=body, headers=headers, **params)
  File "/usr/lib/pymodules/python2.7/couchdb/http.py", line 419, in _request
    credentials=self.credentials)
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/records/http.py", line 259, in request
    raise ServerError((status, error))
couchdb.http.ServerError: (400, ('invalid_consumer_token_pair', 'Invalid consumer and token pair.'))
[ERROR]
    test_migration_in_face_of_broken_records ... Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 312, in run
    self.setUp()
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/application/migration/tests/test_migration.py", line 105, in setUp
    super(TestMigration, self).setUp()
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/application/migration/tests/test_migration.py", line 57, in setUp
    self.database = DesktopDatabase(self.dbname, create=True, ctx=self.ctx)
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/application/server.py", line 75, in __init__
    oauth_tokens=oauth_tokens, ctx=ctx, views_factory=views_factory)
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/records/database.py", line 123, in __init__
    self._reconnect()
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/application/server.py", l...

Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (119.4 KiB)

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.
Browse your desktop CouchDB at file:///tmp/tmp36oZ76/data/couchdb.html
desktopcouch.application.migration.tests.test_migration
  TestMigration
    test_migration_deleted_flag_to_trash ... Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 312, in run
    self.setUp()
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/application/migration/tests/test_migration.py", line 105, in setUp
    super(TestMigration, self).setUp()
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/application/migration/tests/test_migration.py", line 57, in setUp
    self.database = DesktopDatabase(self.dbname, create=True, ctx=self.ctx)
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/application/server.py", line 75, in __init__
    oauth_tokens=oauth_tokens, ctx=ctx, views_factory=views_factory)
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/records/database.py", line 123, in __init__
    self._reconnect()
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/application/server.py", line 85, in _reconnect
    super(DesktopDatabase, self)._reconnect(uri=uri)
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/records/database.py", line 139, in _reconnect
    self._server.create(self._database_name)
  File "/usr/lib/pymodules/python2.7/couchdb/client.py", line 193, in create
    self.resource.put_json(validate_dbname(name))
  File "/usr/lib/pymodules/python2.7/couchdb/http.py", line 405, in put_json
    status, headers, data = self.put(*a, **k)
  File "/usr/lib/pymodules/python2.7/couchdb/http.py", line 384, in put
    return self._request('PUT', path, body=body, headers=headers, **params)
  File "/usr/lib/pymodules/python2.7/couchdb/http.py", line 419, in _request
    credentials=self.credentials)
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/records/http.py", line 259, in request
    raise ServerError((status, error))
couchdb.http.ServerError: (400, ('invalid_consumer_token_pair', 'Invalid consumer and token pair.'))
[ERROR]
    test_migration_in_face_of_broken_records ... Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 312, in run
    self.setUp()
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/application/migration/tests/test_migration.py", line 105, in setUp
    super(TestMigration, self).setUp()
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/application/migration/tests/test_migration.py", line 57, in setUp
    self.database = DesktopDatabase(self.dbname, create=True, ctx=self.ctx)
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/application/server.py", line 75, in __init__
    oauth_tokens=oauth_tokens, ctx=ctx, views_factory=views_factory)
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/records/database.py", line 123, in __init__
    self._reconnect()
  File "/home/otto/tarmac-builds/desktopcouch/trunk/desktopcouch/application/server.py", l...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches