1
=== modified file 'desktopcouch/records/server_base.py'
2
--- desktopcouch/records/server_base.py	2010-08-23 22:51:48 +0000
3
+++ desktopcouch/records/server_base.py	2010-09-22 14:14:44 +0000
4
@@ -150,22 +150,24 @@
5
150
        self._server_class_extras = server_class_extras
150
        self._server_class_extras = server_class_extras
6
151
        self.record_factory = record_factory or Record
151
        self.record_factory = record_factory or Record
7
152
        self.server_uri = uri
152
        self.server_uri = uri
8
153
        self._server = None
9
154
        self.db = None
10
153
        self._reconnect()
155
        self._reconnect()
11
154
        self._changes_since = self.db.info()["update_seq"]
156
        self._changes_since = self.db.info()["update_seq"]
12
155
        self._changes_last_used = 0  # Immediate run works.
157
        self._changes_last_used = 0  # Immediate run works.
13
156
158
14
157
    @staticmethod
159
    @staticmethod
16
158
    def _is_bug_lp539674(ex):
160
    def _is_reconnection_fail(ex):
17
159
        return isinstance(ex, AttributeError) and \
161
        return isinstance(ex, AttributeError) and \
18
160
                ex.args == ("'NoneType' object has no attribute 'makefile'",)
162
                ex.args == ("'NoneType' object has no attribute 'makefile'",)
19
161
163
20
162
    def with_reconnects(self, func, *args, **kwargs):
164
    def with_reconnects(self, func, *args, **kwargs):
22
163
        for retry in (2, 1, None):
165
        for retry in (3, 2, 1, None):
23
164
            try:
166
            try:
24
165
                return func(*args, **kwargs)
167
                return func(*args, **kwargs)
25
166
            except Exception, e:
168
            except Exception, e:
28
167
                if self._is_bug_lp539674(e) and retry:
169
                if self._is_reconnection_fail(e) and retry:
29
168
                    logging.warn("DB connection timed out.  Reconnecting.")
170
                    logging.warn("DB connection failed.  Reconnecting.")
30
169
                    self._reconnect()
171
                    self._reconnect()
31
170
                    continue
172
                    continue
32
171
                elif isinstance(e, socket.error):
173
                elif isinstance(e, socket.error):
33
@@ -175,9 +177,10 @@
34
175
                    continue
177
                    continue
35
176
                else:
178
                else:
36
177
                    raise
179
                    raise
37
180
        raise ValueError("failed to (re-)connect to couchdb server")
38
178
181
39
179
    def _reconnect(self, uri=None):
182
    def _reconnect(self, uri=None):
41
180
        logging.info("Connecting to %s." % (self.server_uri or "discovered local port",))
183
        logging.info("Connecting to %s.", self.server_uri or "discovered local port")
42
181
184
43
182
        self._server = self._server_class(uri or self.server_uri,
185
        self._server = self._server_class(uri or self.server_uri,
44
183
                **self._server_class_extras)
186
                **self._server_class_extras)
45
@@ -186,7 +189,12 @@
46
186
                self._server.create(self._database_name)
189
                self._server.create(self._database_name)
47
187
            else:
190
            else:
48
188
                raise NoSuchDatabase(self._database_name)
191
                raise NoSuchDatabase(self._database_name)
50
189
        self.db = self._server[self._database_name]
192
        if self.db is None:
51
193
            self.db = self._server[self._database_name]
52
194
        else:
53
195
            # Monkey-patch the object the user already uses.  Oook!
54
196
            new_db = self._server[self._database_name]
55
197
            self.db.resource = new_db.resource
56
190
198
57
191
    def _temporary_query(self, map_fun, reduce_fun=None, language='javascript',
199
    def _temporary_query(self, map_fun, reduce_fun=None, language='javascript',
58
192
            wrapper=None, **options):
200
            wrapper=None, **options):
59
@@ -381,9 +389,10 @@
60
381
389
61
382
    def record_exists(self, record_id):
390
    def record_exists(self, record_id):
62
383
        """Check if record with given id exists."""
391
        """Check if record with given id exists."""
64
384
        if record_id not in self.db:
392
        try:
65
393
            record = self.with_reconnects(self.db.__getitem__, record_id)
66
394
        except ResourceNotFound:
67
385
            return False
395
            return False
68
386
        record = self.with_reconnects(self.db.__getitem__, record_id)
69
387
        return not row_is_deleted(record)
396
        return not row_is_deleted(record)
70
388
397
71
389
    def delete_view(self, view_name, design_doc=DEFAULT_DESIGN_DOCUMENT):
398
    def delete_view(self, view_name, design_doc=DEFAULT_DESIGN_DOCUMENT):
72
@@ -434,23 +443,28 @@
73
434
            **params):
443
            **params):
74
435
        """Execute view and return results."""
444
        """Execute view and return results."""
75
436
445
77
437
        class ReconnectingViewWrapper:
446
        class ReconnectingViewWrapper(object):
78
438
            """A view from python-couchdb is an object with attributes that
447
            """A view from python-couchdb is an object with attributes that
79
439
            cause HTTP requests to be fired off when accessed.  If we wish
448
            cause HTTP requests to be fired off when accessed.  If we wish
80
440
            to be able to reconnect on disappearance of the server, then
449
            to be able to reconnect on disappearance of the server, then
81
441
            we must intercept calls from user to python-couchdb."""
450
            we must intercept calls from user to python-couchdb."""
82
442
451
85
443
            def __init__(wrapper, view, *args, **kwargs):
452
            def __init__(wrapper, obj, *args, **kwargs):
86
444
                wrapper.view = self.with_reconnects(view, *args, **kwargs)
453
                wrapper.obj = self.with_reconnects(obj, *args, **kwargs)
87
445
454
88
446
            def ___call__(wrapper, **options):
455
            def ___call__(wrapper, **options):
90
447
                return self.with_reconnects(wrapper.view.__call__, **options)
456
                return self.with_reconnects(wrapper.obj.__call__, **options)
91
448
457
92
449
            def __iter__(wrapper):
458
            def __iter__(wrapper):
94
450
                return self.with_reconnects(wrapper.view.__iter__)
459
                return self.view_with_reconnects(wrapper.obj.__iter__,
95
460
                                                 wrapper.obj)
96
461
97
462
            def __len__(wrapper):
98
463
                return self.view_with_reconnects(wrapper.obj.__len__,
99
464
                                                 wrapper.obj)
100
451
465
101
452
            def __getitem__(wrapper, key):
466
            def __getitem__(wrapper, key):
103
453
                return self.with_reconnects(wrapper.view.__getitem__, key)
467
                return ReconnectingViewWrapper(wrapper.obj.__getitem__, key)
104
454
468
105
455
        if design_doc is None:
469
        if design_doc is None:
106
456
            design_doc = view_name
470
            design_doc = view_name
107
@@ -461,6 +475,44 @@
108
461
                                          **params)
475
                                          **params)
109
462
        return wrapper
476
        return wrapper
110
463
477
111
478
    def view_with_reconnects(self, func, view, *args, **kwargs):
112
479
        for retry in (3, 2, 1, None):
113
480
            try:
114
481
                return func(*args, **kwargs)
115
482
            except Exception, e:
116
483
                if self._is_reconnection_fail(e) and retry:
117
484
                    logging.warn("DB connection failed.  Reconnecting.")
118
485
                    self._reconnect_view(view_result=view)
119
486
                    continue
120
487
                elif isinstance(e, socket.error):
121
488
                    logging.warn("Other socket error %s.  Reconnecting.", e)
122
489
                    sleep(0.3)  
123
490
                    self._reconnect()
124
491
                    continue
125
492
                else:
126
493
                    raise
127
494
        raise ValueError("failed to (re-)connect to couchdb server")
128
495
129
496
    def _reconnect_view(self, uri=None, view_result=None):
130
497
        logging.info("Connecting to %s.",
131
498
                     self.server_uri or "discovered local port")
132
499
        self._server = self._server_class(
133
500
            uri or '/'.join(self.db.resource.uri.split('/')[:-1]),
134
501
                **self._server_class_extras)
135
502
        if self._database_name not in self._server:
136
503
            if self._create:
137
504
                self._server.create(self._database_name)
138
505
            else:
139
506
                raise NoSuchDatabase(self._database_name)
140
507
        if self.db is None:
141
508
            self.db = self._server[self._database_name]
142
509
        else:
143
510
            # Monkey-patch the object the user already uses.  Oook!
144
511
            view_url = urlparse.urlparse(view_result.view.resource.uri)
145
512
            db_url = urlparse.urlparse(self.db.resource.uri)
146
513
            view_result.view.resource.uri = urlparse.urlunparse(
147
514
                [view_url[0], db_url[1]] + list(view_url[2:]))
148
515
149
464
    def add_view(self, view_name, map_js, reduce_js,
516
    def add_view(self, view_name, map_js, reduce_js,
150
465
            design_doc=DEFAULT_DESIGN_DOCUMENT):
517
            design_doc=DEFAULT_DESIGN_DOCUMENT):
151
466
        """Create a view, given a name and the two parts (map and reduce).
518
        """Create a view, given a name and the two parts (map and reduce).
152
@@ -469,7 +521,7 @@
153
469
            design_doc = view_name
521
            design_doc = view_name
154
470
522
155
471
        view = ViewDefinition(design_doc, view_name, map_js, reduce_js)
523
        view = ViewDefinition(design_doc, view_name, map_js, reduce_js)
157
472
        view.sync(self.db)
524
        self.with_reconnects(view.sync, self.db)
158
473
        assert self.view_exists(view_name, design_doc)
525
        assert self.view_exists(view_name, design_doc)
159
474
526
160
475
    def view_exists(self, view_name, design_doc=DEFAULT_DESIGN_DOCUMENT):
527
    def view_exists(self, view_name, design_doc=DEFAULT_DESIGN_DOCUMENT):
161
@@ -595,6 +647,7 @@
162
595
            uri = couchdburi(
647
            uri = couchdburi(
163
596
                self._server.resource.uri, self.db.name, "_changes",
648
                self._server.resource.uri, self.db.name, "_changes",
164
597
                since=self._changes_since)
649
                since=self._changes_since)
165
650
            ## Assume server has not crashed and URI is the same.  FIXME
166
598
            resp, data = self._server.resource.http.request(uri, "GET", "", {})
651
            resp, data = self._server.resource.http.request(uri, "GET", "", {})
167
599
            if resp["status"] != '200':
652
            if resp["status"] != '200':
168
600
                raise IOError(
653
                raise IOError(
169
@@ -611,3 +664,12 @@
170
611
            # If exception in cb, we never update governor.
664
            # If exception in cb, we never update governor.
171
612
            self._changes_last_used = now
665
            self._changes_last_used = now
172
613
        return call_count
666
        return call_count
173
667
174
668
    def ensure_full_commit(self):
175
669
        """
176
670
        Make sure that CouchDb flushes all writes to the database,
177
671
        flushing all delayed commits, before going on.
178
672
        """
179
673
        self.db.resource.post(
180
674
            path='_ensure_full_commit',
181
675
            headers={'Content-Type': 'application/json'})
182
614
676
183
=== modified file 'desktopcouch/records/tests/test_server.py'
184
--- desktopcouch/records/tests/test_server.py	2010-07-02 15:42:05 +0000
185
+++ desktopcouch/records/tests/test_server.py	2010-09-22 14:14:44 +0000
186
@@ -19,12 +19,17 @@
187
19
19
188
20
"""testing database/contact.py module"""
20
"""testing database/contact.py module"""
189
21
import testtools
21
import testtools
190
22
import os
191
23
import signal
192
24
import time
193
22
25
194
23
import desktopcouch.tests as test_environment
26
import desktopcouch.tests as test_environment
195
24
from desktopcouch.records.server import CouchDatabase
27
from desktopcouch.records.server import CouchDatabase
196
25
from desktopcouch.records.server_base import (
28
from desktopcouch.records.server_base import (
197
26
    row_is_deleted, NoSuchDatabase, FieldsConflict, ResourceConflict)
29
    row_is_deleted, NoSuchDatabase, FieldsConflict, ResourceConflict)
198
27
from desktopcouch.records.record import Record
30
from desktopcouch.records.record import Record
199
31
from desktopcouch.stop_local_couchdb import stop_couchdb
200
32
from desktopcouch import find_pid
201
28
33
202
29
# pylint can't deal with failing imports even when they're handled
34
# pylint can't deal with failing imports even when they're handled
203
30
# pylint: disable-msg=F0401
35
# pylint: disable-msg=F0401
204
@@ -53,7 +58,7 @@
205
53
        # Connect to CouchDB server
58
        # Connect to CouchDB server
206
54
        self.dbname = self._testMethodName
59
        self.dbname = self._testMethodName
207
55
        self.database = CouchDatabase(self.dbname, create=True,
60
        self.database = CouchDatabase(self.dbname, create=True,
209
56
                ctx=test_environment.test_context)
61
                ctx=self.get_test_context())
210
57
        #create some records to pull out and test
62
        #create some records to pull out and test
211
58
        self.database.put_record(Record({
63
        self.database.put_record(Record({
212
59
            "key1_1": "val1_1", "key1_2": "val1_2", "key1_3": "val1_3",
64
            "key1_1": "val1_1", "key1_2": "val1_2", "key1_3": "val1_3",
213
@@ -67,8 +72,28 @@
214
67
72
215
68
    def tearDown(self):
73
    def tearDown(self):
216
69
        """tear down each test"""
74
        """tear down each test"""
217
75
        this_context = self.get_test_context()
218
76
        if this_context != test_environment.test_context:
219
77
            stop_couchdb(ctx=this_context)
220
70
        super(TestCouchDatabase, self).tearDown()
78
        super(TestCouchDatabase, self).tearDown()
222
71
        del self.database._server[self.dbname]
79
223
80
    def get_test_context(self):
224
81
        return test_environment.test_context
225
82
226
83
    def maybe_die(self):
227
84
        pass
228
85
229
86
    def wait_until_server_dead(self, pid=None):
230
87
        if pid is not None:
231
88
            pid = find_pid(start_if_not_running=False, ctx=self.get_test_context())
232
89
        if pid is None:
233
90
            return
234
91
        while True:
235
92
            try:
236
93
                os.kill(pid, 0)  # Wait until exited
237
94
                time.sleep(0.1)
238
95
            except OSError:
239
96
                break
240
72
97
241
73
    def test_database_not_exists(self):
98
    def test_database_not_exists(self):
242
74
        self.assertRaises(
99
        self.assertRaises(
243
@@ -78,12 +103,14 @@
244
78
        """Test getting mutliple records by type"""
103
        """Test getting mutliple records by type"""
245
79
        records = self.database.get_records(
104
        records = self.database.get_records(
246
80
            record_type="test.com",create_view=True)
105
            record_type="test.com",create_view=True)
248
81
        self.assertEqual(3,len(records))
106
        self.maybe_die()  # should be able to survive couchdb death
249
107
        self.assertEqual(3, len(records))
250
82
108
251
83
    def test_get_record(self):
109
    def test_get_record(self):
252
84
        """Test getting a record."""
110
        """Test getting a record."""
253
85
        record = Record({'record_number': 0}, record_type="http://example.com/")
111
        record = Record({'record_number': 0}, record_type="http://example.com/")
254
86
        record_id = self.database.put_record(record)
112
        record_id = self.database.put_record(record)
255
113
        self.maybe_die()  # should be able to survive couchdb death
256
87
        retrieved_record = self.database.get_record(record_id)
114
        retrieved_record = self.database.get_record(record_id)
257
88
        self.assertEqual(0, retrieved_record['record_number'])
115
        self.assertEqual(0, retrieved_record['record_number'])
258
89
116
259
@@ -91,7 +118,8 @@
260
91
        """Test putting a record."""
118
        """Test putting a record."""
261
92
        record = Record({'record_number': 0}, record_type="http://example.com/")
119
        record = Record({'record_number': 0}, record_type="http://example.com/")
262
93
        record_id = self.database.put_record(record)
120
        record_id = self.database.put_record(record)
264
94
        retrieved_record = self.database._server[self.dbname][record_id]
121
        self.maybe_die()  # should be able to survive couchdb death
265
122
        retrieved_record = self.database.get_record(record_id)
266
95
        self.assertEqual(
123
        self.assertEqual(
267
96
            record['record_number'], retrieved_record['record_number'])
124
            record['record_number'], retrieved_record['record_number'])
268
97
125
269
@@ -121,7 +149,9 @@
270
121
        record = Record({'record_number': 0}, record_type="http://example.com/")
149
        record = Record({'record_number': 0}, record_type="http://example.com/")
271
122
        record_id = self.database.put_record(record)
150
        record_id = self.database.put_record(record)
272
123
        self.database.delete_record(record_id)
151
        self.database.delete_record(record_id)
273
152
        ###self.maybe_die()  # should be able to survive couchdb death
274
124
        deleted_record = self.database._server[self.dbname][record_id]
153
        deleted_record = self.database._server[self.dbname][record_id]
275
154
        #deleted_record = self.database.get_record(record_id)
276
125
        self.assert_(deleted_record['application_annotations']['Ubuntu One'][
155
        self.assert_(deleted_record['application_annotations']['Ubuntu One'][
277
126
            'private_application_annotations']['deleted'])
156
            'private_application_annotations']['deleted'])
278
127
157
279
@@ -154,6 +184,7 @@
280
154
        record = Record({'record_number': 0}, record_type="http://example.com/")
184
        record = Record({'record_number': 0}, record_type="http://example.com/")
281
155
        record_id = self.database.put_record(record)
185
        record_id = self.database.put_record(record)
282
156
        self.database.delete_record(record_id)
186
        self.database.delete_record(record_id)
283
187
        self.maybe_die()  # should be able to survive couchdb death
284
157
        retrieved_record = self.database.get_record(record_id)
188
        retrieved_record = self.database.get_record(record_id)
285
158
        self.assertEqual(None, retrieved_record)
189
        self.assertEqual(None, retrieved_record)
286
159
190
287
@@ -162,6 +193,7 @@
288
162
        record = Record({'record_number': 0}, record_type="http://example.com/")
193
        record = Record({'record_number': 0}, record_type="http://example.com/")
289
163
        self.assert_(not self.database.record_exists("ThisMustNotExist"))
194
        self.assert_(not self.database.record_exists("ThisMustNotExist"))
290
164
        record_id = self.database.put_record(record)
195
        record_id = self.database.put_record(record)
291
196
        self.maybe_die()  # should be able to survive couchdb death
292
165
        self.assert_(self.database.record_exists(record_id))
197
        self.assert_(self.database.record_exists(record_id))
293
166
        self.database.delete_record(record_id)
198
        self.database.delete_record(record_id)
294
167
        self.assert_(not self.database.record_exists(record_id))
199
        self.assert_(not self.database.record_exists(record_id))
295
@@ -171,12 +203,14 @@
296
171
        dictionary = {'record_number': 0, 'field1': 1, 'field2': 2}
203
        dictionary = {'record_number': 0, 'field1': 1, 'field2': 2}
297
172
        record = Record(dictionary, record_type="http://example.com/")
204
        record = Record(dictionary, record_type="http://example.com/")
298
173
        record_id = self.database.put_record(record)
205
        record_id = self.database.put_record(record)
299
206
        self.maybe_die()  # should be able to survive couchdb death
300
174
        # manipulate the database 'out of view'
207
        # manipulate the database 'out of view'
301
175
        non_working_copy = self.database.get_record(record_id)
208
        non_working_copy = self.database.get_record(record_id)
302
176
        non_working_copy['field2'] = 22
209
        non_working_copy['field2'] = 22
303
177
        non_working_copy['field3'] = 3
210
        non_working_copy['field3'] = 3
304
178
        self.database.put_record(non_working_copy)
211
        self.database.put_record(non_working_copy)
305
179
        self.database.update_fields(record_id, {'field1': 11})
212
        self.database.update_fields(record_id, {'field1': 11})
306
213
        self.maybe_die()  # should be able to survive couchdb death
307
180
        working_copy = self.database.get_record(record_id)
214
        working_copy = self.database.get_record(record_id)
308
181
        self.assertEqual(0, working_copy['record_number'])
215
        self.assertEqual(0, working_copy['record_number'])
309
182
        self.assertEqual(11, working_copy['field1'])
216
        self.assertEqual(11, working_copy['field1'])
310
@@ -200,10 +234,12 @@
311
200
        self.assertRaises(
234
        self.assertRaises(
312
201
            KeyError, self.database.delete_view, view2_name, design_doc)
235
            KeyError, self.database.delete_view, view2_name, design_doc)
313
202
        self.database.add_view(view1_name, map_js, reduce_js, design_doc)
236
        self.database.add_view(view1_name, map_js, reduce_js, design_doc)
314
237
        self.maybe_die()  # should be able to survive couchdb death
315
203
        self.database.add_view(view2_name, map_js, reduce_js, design_doc)
238
        self.database.add_view(view2_name, map_js, reduce_js, design_doc)
316
204
        self.database.delete_view(view1_name, design_doc)
239
        self.database.delete_view(view1_name, design_doc)
317
205
        self.assertRaises(
240
        self.assertRaises(
318
206
            KeyError, self.database.delete_view, view1_name, design_doc)
241
            KeyError, self.database.delete_view, view1_name, design_doc)
319
242
        self.maybe_die()  # should be able to survive couchdb death
320
207
        self.database.delete_view(view2_name, design_doc)
243
        self.database.delete_view(view2_name, design_doc)
321
208
        self.assertRaises(
244
        self.assertRaises(
322
209
            KeyError, self.database.delete_view, view2_name, design_doc)
245
            KeyError, self.database.delete_view, view2_name, design_doc)
323
@@ -237,6 +273,7 @@
324
237
            record_ids_we_care_about.remove(row.id)
273
            record_ids_we_care_about.remove(row.id)
325
238
            self.assertFalse(row_is_deleted(row))
274
            self.assertFalse(row_is_deleted(row))
326
239
275
327
276
        self.maybe_die()  # should be able to survive couchdb death
328
240
        self.assertTrue(len(record_ids_we_care_about) == 0, "expected zero")
277
        self.assertTrue(len(record_ids_we_care_about) == 0, "expected zero")
329
241
278
330
242
        self.assertRaises(KeyError, self.database.get_records,
279
        self.assertRaises(KeyError, self.database.get_records,
331
@@ -250,6 +287,7 @@
332
250
        map_js = """function(doc) { emit(doc._id, null) }"""
287
        map_js = """function(doc) { emit(doc._id, null) }"""
333
251
        self.database.add_view(view_name, map_js, None, design_doc)
288
        self.database.add_view(view_name, map_js, None, design_doc)
334
252
289
335
290
        self.maybe_die()  # should be able to survive couchdb death
336
253
        self.assertEqual(self.database.list_views(design_doc), [view_name])
291
        self.assertEqual(self.database.list_views(design_doc), [view_name])
337
254
        self.database.delete_view(view_name, design_doc)
292
        self.database.delete_view(view_name, design_doc)
338
255
293
339
@@ -257,11 +295,13 @@
340
257
295
341
258
    def test_get_view_by_type_new_but_already(self):
296
    def test_get_view_by_type_new_but_already(self):
342
259
        self.database.get_records(create_view=True)
297
        self.database.get_records(create_view=True)
343
298
        self.maybe_die()  # should be able to survive couchdb death
344
260
        self.database.get_records(create_view=True)
299
        self.database.get_records(create_view=True)
345
261
        # No exceptions on second run?  Yay.
300
        # No exceptions on second run?  Yay.
346
262
301
347
263
    def test_get_view_by_type_createxcl_fail(self):
302
    def test_get_view_by_type_createxcl_fail(self):
348
264
        self.database.get_records(create_view=True)
303
        self.database.get_records(create_view=True)
349
304
        self.maybe_die()  # should be able to survive couchdb death
350
265
        self.assertRaises(KeyError, self.database.get_records, create_view=None)
305
        self.assertRaises(KeyError, self.database.get_records, create_view=None)
351
266
306
352
267
    def test_get_changes(self):
307
    def test_get_changes(self):
353
@@ -321,6 +361,8 @@
354
321
        # Ensure time is same.
361
        # Ensure time is same.
355
322
        self.assertEqual(saved_time, self.database._changes_last_used)
362
        self.assertEqual(saved_time, self.database._changes_last_used)
356
323
363
357
364
        ###self.maybe_die()  # should be able to survive couchdb death
358
365
359
324
        # Next time we run, we get the same event again.
366
        # Next time we run, we get the same event again.
360
325
        # Consume queued changes.
367
        # Consume queued changes.
361
326
        count = self.database.report_changes(rep)
368
        count = self.database.report_changes(rep)
362
@@ -370,6 +412,7 @@
363
370
        constructed_record.attach(content, "nu/mbe/rs", "text/plain")
412
        constructed_record.attach(content, "nu/mbe/rs", "text/plain")
364
371
        constructed_record.attach("string", "another document", "text/plain")
413
        constructed_record.attach("string", "another document", "text/plain")
365
372
414
366
415
        ###self.maybe_die()  # should be able to survive couchdb death
367
373
        constructed_record.attach("XXXXXXXXX", "never used", "text/plain")
416
        constructed_record.attach("XXXXXXXXX", "never used", "text/plain")
368
374
        constructed_record.detach("never used")  # detach works before commit.
417
        constructed_record.detach("never used")  # detach works before commit.
369
375
418
370
@@ -382,6 +425,7 @@
371
382
        self.assertRaises(KeyError, constructed_record.attach, content,
425
        self.assertRaises(KeyError, constructed_record.attach, content,
372
383
                "another document", "text/x-rst")
426
                "another document", "text/x-rst")
373
384
427
374
428
        ###self.maybe_die()  # should be able to survive couchdb death
375
385
        record_id = self.database.put_record(constructed_record)
429
        record_id = self.database.put_record(constructed_record)
376
386
        retrieved_record = self.database.get_record(record_id)
430
        retrieved_record = self.database.get_record(record_id)
377
387
431
378
@@ -402,6 +446,7 @@
379
402
        # get new
446
        # get new
380
403
        retrieved_record = self.database.get_record(record_id)
447
        retrieved_record = self.database.get_record(record_id)
381
404
448
382
449
        ###self.maybe_die()  # should be able to survive couchdb death
383
405
        # We can get a list of attachments.
450
        # We can get a list of attachments.
384
406
        self.assertEqual(set(retrieved_record.list_attachments()),
451
        self.assertEqual(set(retrieved_record.list_attachments()),
385
407
                set(["nu/mbe/rs", "Document"]))
452
                set(["nu/mbe/rs", "Document"]))
386
@@ -424,6 +469,7 @@
387
424
        self.assertEqual(out_data, content.getvalue())
469
        self.assertEqual(out_data, content.getvalue())
388
425
        self.assertEqual(out_content_type, "text/plain")
470
        self.assertEqual(out_content_type, "text/plain")
389
426
471
390
472
        ###self.maybe_die()  # should be able to survive couchdb death
391
427
        # Asking for a named document that does not exist causes KeyError.
473
        # Asking for a named document that does not exist causes KeyError.
392
428
        self.assertRaises(KeyError, retrieved_record.attachment_data,
474
        self.assertRaises(KeyError, retrieved_record.attachment_data,
393
429
                "NoExist")
475
                "NoExist")
394
@@ -454,6 +500,7 @@
395
454
        # ordinary requests are in key order
500
        # ordinary requests are in key order
396
455
        self.assertEqual(data, sorted(data))
501
        self.assertEqual(data, sorted(data))
397
456
502
398
503
        self.maybe_die()  # should be able to survive couchdb death
399
457
        # now request descending order and confirm that it *is* descending
504
        # now request descending order and confirm that it *is* descending
400
458
        descdata = [i.key for i in
505
        descdata = [i.key for i in
401
459
            list(self.database.execute_view(view1_name, design_doc,
506
            list(self.database.execute_view(view1_name, design_doc,
402
@@ -513,3 +560,38 @@
403
513
            self.fail()
560
            self.fail()
404
514
        except FieldsConflict, e:
561
        except FieldsConflict, e:
405
515
            self.assertEqual({('field1',): (22, 11)}, e.conflicts)
562
            self.assertEqual({('field1',): (22, 11)}, e.conflicts)
406
563
407
564
408
565
class TestServerDiesSegv(TestCouchDatabase):
409
566
    def get_test_context(self):
410
567
        try:
411
568
            return self.ctx
412
569
        except AttributeError:
413
570
            self.ctx = test_environment.create_new_test_environment()
414
571
            return self.ctx
415
572
416
573
    def maybe_die(self):
417
574
        self.database.ensure_full_commit()
418
575
        time.sleep(2)
419
576
        pid = find_pid(start_if_not_running=False, ctx=self.get_test_context())
420
577
        if pid is None:
421
578
            print "couchdb has already quit!  That's unexpected."
422
579
            return
423
580
        print "DIE, process", pid, "!"
424
581
        os.kill(pid, signal.SIGSEGV)
425
582
        self.wait_until_server_dead(pid=pid)
426
583
427
584
428
585
class TestServerDiesNormal(TestCouchDatabase):
429
586
    def get_test_context(self):
430
587
        try:
431
588
            return self.ctx
432
589
        except AttributeError:
433
590
            self.ctx = test_environment.create_new_test_environment()
434
591
            return self.ctx
435
592
436
593
    def maybe_die(self):
437
594
        self.database.ensure_full_commit()
438
595
        time.sleep(2)
439
596
        stop_couchdb(ctx=self.get_test_context())
440
597
        self.wait_until_server_dead()
441
516
598
442
=== modified file 'desktopcouch/start_local_couchdb.py'
443
--- desktopcouch/start_local_couchdb.py	2010-09-17 15:24:19 +0000
444
+++ desktopcouch/start_local_couchdb.py	2010-09-22 14:14:44 +0000
445
@@ -47,6 +47,8 @@
446
47
import sys
47
import sys
447
48
import time
48
import time
448
49
49
449
50
from gnomekeyring import NoKeyringDaemonError
450
51
451
50
import desktopcouch
52
import desktopcouch
452
51
from desktopcouch import local_files, read_pidfile, process_is_couchdb
53
from desktopcouch import local_files, read_pidfile, process_is_couchdb
453
52
from desktopcouch.records.server import CouchDatabase
54
from desktopcouch.records.server import CouchDatabase
454
@@ -216,7 +218,12 @@
455
216
            logging.info("Ubuntu SSO dbus service could not be used.")
218
            logging.info("Ubuntu SSO dbus service could not be used.")
456
217
219
457
218
    if sso: 
220
    if sso: 
459
219
        credentials = sso.find_credentials('Ubuntu One')
221
        try:
460
222
            credentials = sso.find_credentials('Ubuntu One')
461
223
        except NoKeyringDaemonError:
462
224
            logging.info(
463
225
                "NoKeyringDaemonError exception raised.")
464
226
            credentials = None
465
220
        if credentials and len(credentials) > 0:
227
        if credentials and len(credentials) > 0:
466
221
            pair_with_ubuntuone()
228
            pair_with_ubuntuone()
467
222
 
229
 
468
223
230
469
=== modified file 'desktopcouch/stop_local_couchdb.py'
470
--- desktopcouch/stop_local_couchdb.py	2010-02-04 22:31:41 +0000
471
+++ desktopcouch/stop_local_couchdb.py	2010-09-22 14:14:44 +0000
472
@@ -25,7 +25,7 @@
473
25
from desktopcouch import local_files
25
from desktopcouch import local_files
474
26
26
475
27
def stop_couchdb(ctx=local_files.DEFAULT_CONTEXT):
27
def stop_couchdb(ctx=local_files.DEFAULT_CONTEXT):
477
28
    local_exec = ctx.couch_exec_command + ["-k"]
28
    local_exec = ctx.couch_exec_command + ["-d"]
478
29
    try:
29
    try:
479
30
        retcode = subprocess.call(local_exec, shell=False)
30
        retcode = subprocess.call(local_exec, shell=False)
480
31
        if retcode < 0:
31
        if retcode < 0:
Reviewer	Date Requested	Status
Manuel de la Peña (community)	2010-09-17	Approve on 2010-09-21
Eric Casteleijn (community)		Approve on 2010-09-17
Review via email: mp+35853@code.launchpad.net