1
=== modified file 'lib/lp/testing/__init__.py'
2
--- lib/lp/testing/__init__.py	2010-09-22 18:37:57 +0000
3
+++ lib/lp/testing/__init__.py	2010-09-29 20:38:55 +0000
4
@@ -112,7 +112,10 @@
5
112
    )
112
    )
6
113
from canonical.launchpad.webapp.errorlog import ErrorReportEvent
113
from canonical.launchpad.webapp.errorlog import ErrorReportEvent
7
114
from canonical.launchpad.webapp.interaction import ANONYMOUS
114
from canonical.launchpad.webapp.interaction import ANONYMOUS
9
115
from canonical.launchpad.webapp.servers import WebServiceTestRequest
115
from canonical.launchpad.webapp.servers import (
10
116
    LaunchpadTestRequest,
11
117
    WebServiceTestRequest,
12
118
    )
13
116
from canonical.launchpad.windmill.testing import constants
119
from canonical.launchpad.windmill.testing import constants
14
117
from lp.codehosting.vfs import (
120
from lp.codehosting.vfs import (
15
118
    branch_id_to_path,
121
    branch_id_to_path,
16
@@ -120,6 +123,10 @@
17
120
    )
123
    )
18
121
from lp.registry.interfaces.packaging import IPackagingUtil
124
from lp.registry.interfaces.packaging import IPackagingUtil
19
122
from lp.services.osutils import override_environ
125
from lp.services.osutils import override_environ
20
126
from lp.services import features
21
127
from lp.services.features.flags import FeatureController
22
128
from lp.services.features.model import getFeatureStore, FeatureFlag
23
129
from lp.services.features.webapp import ScopesFromRequest
24
123
# Import the login helper functions here as it is a much better
130
# Import the login helper functions here as it is a much better
25
124
# place to import them from in tests.
131
# place to import them from in tests.
26
125
from lp.testing._login import (
132
from lp.testing._login import (
27
@@ -222,9 +229,10 @@
28
222
229
29
223
class StormStatementRecorder:
230
class StormStatementRecorder:
30
224
    """A storm tracer to count queries.
231
    """A storm tracer to count queries.
34
225
    
232
35
226
    This exposes the count and queries as lp.testing._webservice.QueryCollector
233
    This exposes the count and queries as
36
227
    does permitting its use with the HasQueryCount matcher.
234
    lp.testing._webservice.QueryCollector does permitting its use with the
37
235
    HasQueryCount matcher.
38
228
236
39
229
    It also meets the context manager protocol, so you can gather queries
237
    It also meets the context manager protocol, so you can gather queries
40
230
    easily:
238
    easily:
41
@@ -875,6 +883,19 @@
42
875
        zope.event.subscribers[:] = old_subscribers
883
        zope.event.subscribers[:] = old_subscribers
43
876
884
44
877
885
45
886
@contextmanager
46
887
def feature_flags():
47
888
    """Provide a context in which feature flags work."""
48
889
    empty_request = LaunchpadTestRequest()
49
890
    old_features = getattr(features.per_thread, 'features', None)
50
891
    features.per_thread.features = FeatureController(
51
892
        ScopesFromRequest(empty_request).lookup)
52
893
    try:
53
894
        yield
54
895
    finally:
55
896
        features.per_thread.features = old_features
56
897
57
898
58
878
# XXX: This doesn't seem like a generically-useful testing function. Perhaps
899
# XXX: This doesn't seem like a generically-useful testing function. Perhaps
59
879
# it should go in a sub-module or something? -- jml
900
# it should go in a sub-module or something? -- jml
60
880
def get_lsb_information():
901
def get_lsb_information():
61
@@ -977,6 +998,21 @@
62
977
    return contents
998
    return contents
63
978
999
64
979
1000
65
1001
def set_feature_flag(name, value, scope=u'default', priority=1):
66
1002
    """Set a feature flag to the specified value.
67
1003
68
1004
    In order to access the flag, use the feature_flags context manager or
69
1005
    populate features.per_thread.features some other way.
70
1006
    :param name: The name of the flag.
71
1007
    :param value: The value of the flag.
72
1008
    :param scope: The scope in which the specified value applies.
73
1009
    """
74
1010
    assert getattr(features.per_thread, 'features', None) is not None
75
1011
    flag = FeatureFlag(
76
1012
        scope=scope, flag=name, value=value, priority=priority)
77
1013
    getFeatureStore().add(flag)
78
1014
79
1015
80
980
def validate_mock_class(mock_class):
1016
def validate_mock_class(mock_class):
81
981
    """Validate method signatures in mock classes derived from real classes.
1017
    """Validate method signatures in mock classes derived from real classes.
82
982
1018
83
983
1019
84
=== added file 'lib/lp/testing/tests/test_testing.py'
85
--- lib/lp/testing/tests/test_testing.py	1970-01-01 00:00:00 +0000
86
+++ lib/lp/testing/tests/test_testing.py	2010-09-29 20:38:55 +0000
87
@@ -0,0 +1,43 @@
88
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
89
2
# GNU Affero General Public License version 3 (see the file LICENSE).
90
3
91
4
from __future__ import with_statement
92
5
93
6
"""Tests for the testing module."""
94
7
95
8
__metaclass__ = type
96
9
97
10
import unittest
98
11
99
12
from canonical.testing.layers import DatabaseFunctionalLayer
100
13
from lp.services.features import getFeatureFlag
101
14
from lp.testing import (
102
15
    feature_flags,
103
16
    set_feature_flag,
104
17
    TestCase,
105
18
    )
106
19
107
20
108
21
class TestFeatureFlags(TestCase):
109
22
110
23
    layer = DatabaseFunctionalLayer
111
24
112
25
    def test_set_feature_flags_raises_if_not_available(self):
113
26
        """set_feature_flags prevents mistakes mistakes by raising."""
114
27
        self.assertRaises(AssertionError, set_feature_flag, u'name', u'value')
115
28
116
29
    def test_flags_set_within_feature_flags_context(self):
117
30
        """In the feature_flags context, set/get works."""
118
31
        self.useContext(feature_flags())
119
32
        set_feature_flag(u'name', u'value')
120
33
        self.assertEqual('value', getFeatureFlag('name'))
121
34
122
35
    def test_flags_unset_outside_feature_flags_context(self):
123
36
        """get fails when used outside the feature_flags context."""
124
37
        with feature_flags():
125
38
            set_feature_flag(u'name', u'value')
126
39
        self.assertIs(None, getFeatureFlag('name'))
127
40
128
41
129
42
def test_suite():
130
43
    return unittest.TestLoader().loadTestsFromName(__name__)
Status:	Merged
Approved by:	Paul Hummer on 2010-09-29
Approved revision:	no longer in the source branch.
Merged at revision:	9850
Proposed branch:	lp:~abentley/launchpad/test-feature-flags
Merge into:	lp:launchpad/db-devel
Diff against target:	130 lines (+83/-4) 2 files modified lib/lp/testing/__init__.py (+40/-4) lib/lp/testing/tests/test_testing.py (+43/-0)
To merge this branch:	bzr merge lp:~abentley/launchpad/test-feature-flags
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Paul Hummer (community)		2010-09-29	Approve on 2010-09-29
Review via email: mp+37061@code.launchpad.net