Merge lp://qastaging/~vds/desktopcouch/views-with-reconnector-proxy into lp://qastaging/desktopcouch
Proposed by
Vincenzo Di Somma
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Manuel de la Peña | ||||
Approved revision: | 184 | ||||
Merged at revision: | 175 | ||||
Proposed branch: | lp://qastaging/~vds/desktopcouch/views-with-reconnector-proxy | ||||
Merge into: | lp://qastaging/desktopcouch | ||||
Diff against target: |
480 lines (+172/-21) 4 files modified
desktopcouch/records/server_base.py (+77/-15) desktopcouch/records/tests/test_server.py (+86/-4) desktopcouch/start_local_couchdb.py (+8/-1) desktopcouch/stop_local_couchdb.py (+1/-1) |
||||
To merge this branch: | bzr merge lp://qastaging/~vds/desktopcouch/views-with-reconnector-proxy | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Manuel de la Peña (community) | Approve | ||
Eric Casteleijn (community) | Approve | ||
Review via email:
|
Commit message
Now View and ViewResults can reconnect if the couchdb server crashes.
Description of the change
Now ViewResult reconnects when the server crashes.
To post a comment you must log in.
Ooooh, live monkeys!
Code looks good, but the tests take ages now, and it looks like the server is killed and restarted way too often, though most of the tests seem to pass. Adding test output below. If this is all intentional, approved.
One test does fail, but I believe that's because I'm on lucid:
======= ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= == pair.tests. test_ubuntuone_ pairing
[ERROR]: desktopcouch.
Traceback (most recent call last): python2. 6/dist- packages/ twisted/ trial/runner. py", line 563, in loadPackage python2. 6/dist- packages/ twisted/ python/ modules. py", line 381, in load pythonPath. moduleLoader( self.name) python2. 6/dist- packages/ twisted/ python/ reflect. py", line 464, in namedAny Stack(trialname ) eric/canonical/ desktopcouch/ r-vds/desktopco uch/pair/ tests/test_ ubuntuone_ pairing. py", line 19, in <module> ImportError: No module named mocker ------- ------- ------- ------- ------- ------- ------- ------- ------- ------- --
File "/usr/lib/
module = modinfo.load()
File "/usr/lib/
return self.pathEntry.
File "/usr/lib/
topLevelPackage = _importAndCheck
File "/home/
from mocker import Mocker
exceptions.
-------
eric@eric- laptop: ~/canonical/ desktopcouch/ r-vds$ PYTHONPATH=. trial desktopcouch /tmp/tmpEaIpq4/ data/couchdb. html bookmarks. tests.test_ record ecord bookmark_ record ... [OK] feed_record ... [OK] folder_ record ... [OK] Record separator_ record ... [OK] contacts. tests.test_ contactspicker icker can_contruct_ contactspicker ... [OK] contacts. tests.test_ create create_ many_contacts ... [OK] head_or_ tails ... [OK] random_ bools ... [OK] contacts. tests.test_ record contact_ record ... [OK] contacts. tests.test_ view find_contact_ starting ... [OK] find_contacts_ exact ... [OK] notes.tests. test_record note_record ... [OK] pair.tests. test_couchdb_ io get_database_ names_replicata ble ... [OK] get_database_ names_replicata ble_bad_ server ... [SKIPPED] get_my_ host_unique_ id ... [OK] obsfuscation ... [OK]
Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
desktopcouch.
TestBookmarkR
test_
TestFeedRecord
test_
TestFolderRecord
test_
TestSeparator
test_
desktopcouch.
TestContactsP
test_
desktopcouch.
TestCreate
test_
test_
test_
desktopcouch.
TestContactRecord
test_
desktopcouch.
TestLocalFiles
test_
test_
desktopcouch.
TestNoteRecord
test_
desktopcouch.
TestCouchdbIo
test_
test_
test_
test_mkuri ... [OK]
test_
...