1
=== modified file 'lib/canonical/database/sqlbase.py'
2
--- lib/canonical/database/sqlbase.py	2009-12-02 11:57:11 +0000
3
+++ lib/canonical/database/sqlbase.py	2009-12-14 21:29:12 +0000
4
@@ -341,27 +341,17 @@
5
341
            cls._dbhost = dbhost
341
            cls._dbhost = dbhost
6
342
            cls._dbuser = dbuser
342
            cls._dbuser = dbuser
7
343
            cls._isolation = isolation
343
            cls._isolation = isolation
9
344
            cls._reset_store()
344
            cls._reset_stores()
10
345
            cls._installed = cls
345
            cls._installed = cls
11
346
        return cls._installed
346
        return cls._installed
12
347
347
13
348
    @staticmethod
348
    @staticmethod
16
349
    def _reset_store():
349
    def _reset_stores():
17
350
        """Reset the MAIN DEFAULT store.
350
        """Reset the active stores.
18
351
351
19
352
        This is required for connection setting changes to be made visible.
352
        This is required for connection setting changes to be made visible.
20
353
21
354
        Other stores do not need to be reset, as code using other stores
22
355
        or explicit flavors isn't using this compatibility layer.
23
356
        """
353
        """
32
357
        main_store = _get_sqlobject_store()
354
        for name, store in getUtility(IZStorm).iterstores():
25
358
        # XXX: salgado, 2009-11-06, bug=253542: The import is here to work
26
359
        # around a particularly convoluted circular import.
27
360
        from canonical.launchpad.webapp.interfaces import (
28
361
            IStoreSelector, AUTH_STORE, DEFAULT_FLAVOR)
29
362
        auth_store = getUtility(IStoreSelector).get(
30
363
            AUTH_STORE, DEFAULT_FLAVOR)
31
364
        for store in [main_store, auth_store]:
33
365
            connection = store._connection
355
            connection = store._connection
34
366
            if connection._state == storm.database.STATE_CONNECTED:
356
            if connection._state == storm.database.STATE_CONNECTED:
35
367
                if connection._raw_connection is not None:
357
                if connection._raw_connection is not None:
36
@@ -392,7 +382,7 @@
37
392
        assert cls._installed is not None, (
382
        assert cls._installed is not None, (
38
393
            "ZopelessTransactionManager not installed")
383
            "ZopelessTransactionManager not installed")
39
394
        config.pop(cls._CONFIG_OVERLAY_NAME)
384
        config.pop(cls._CONFIG_OVERLAY_NAME)
41
395
        cls._reset_store()
385
        cls._reset_stores()
42
396
        cls._installed = None
386
        cls._installed = None
43
397
387
44
398
    @classmethod
388
    @classmethod
45
399
389
46
=== modified file 'lib/canonical/database/tests/test_zopeless_transaction_manager.py'
47
--- lib/canonical/database/tests/test_zopeless_transaction_manager.py	2009-11-06 21:30:29 +0000
48
+++ lib/canonical/database/tests/test_zopeless_transaction_manager.py	2009-12-14 21:29:12 +0000
49
@@ -4,14 +4,17 @@
50
4
from textwrap import dedent
4
from textwrap import dedent
51
5
import unittest
5
import unittest
52
6
6
54
7
import psycopg2
7
from zope.component import getUtility
55
8
56
9
from storm.zope.interfaces import IZStorm
57
8
10
58
9
from canonical.config import config
11
from canonical.config import config
59
10
from canonical.database.sqlbase import ZopelessTransactionManager
12
from canonical.database.sqlbase import ZopelessTransactionManager
60
13
from canonical.testing.layers import LaunchpadZopelessLayer
61
11
from lp.testing import TestCase
14
from lp.testing import TestCase
62
12
15
63
13
16
65
14
class TestZopelessTransactionManager(TestCase):
17
class TestZopelessTransactionManagerNoLayer(TestCase):
66
15
18
67
16
    def test_initZopeless_connects_to_auth_master_db(self):
19
    def test_initZopeless_connects_to_auth_master_db(self):
68
17
        # Some scripts might create EmailAddress and Account entries, so
20
        # Some scripts might create EmailAddress and Account entries, so
69
@@ -39,5 +42,21 @@
70
39
            # Clean up the configuration
42
            # Clean up the configuration
71
40
            config.pop('new-db')
43
            config.pop('new-db')
72
41
44
73
45
74
46
class TestZopelessTransactionManager(TestCase):
75
47
    layer = LaunchpadZopelessLayer
76
48
77
49
    def test_reset_stores_only_does_so_on_active_stores(self):
78
50
        active_stores = [item[0] for item in getUtility(IZStorm).iterstores()]
79
51
        self.assertContentEqual(
80
52
            ['launchpad-main-master', 'session'], active_stores)
81
53
        ZopelessTransactionManager._reset_stores()
82
54
        # If any other stores had been reset, they'd be activated and would
83
55
        # then be returned by ZStorm.iterstores().
84
56
        new_active_stores = [
85
57
            item[0] for item in getUtility(IZStorm).iterstores()]
86
58
        self.assertContentEqual(active_stores, new_active_stores)
87
59
88
60
89
42
def test_suite():
61
def test_suite():
90
43
    return unittest.TestLoader().loadTestsFromName(__name__)
62
    return unittest.TestLoader().loadTestsFromName(__name__)
Reviewer	Review Type	Date Requested	Status
Данило Шеган (community)	release-critical	2009-12-14	Approve on 2009-12-14
Henning Eggers (community)	code	2009-12-14	Approve on 2009-12-14
Review via email: mp+16120@code.launchpad.net