← Back to branch summary

~allenap/maas/regiond-bind-on-all-interfaces

« back to all changes in this revision

Viewing changes to src/maas/tests/test_maas.py

  • Committer: Gavin Panella
  • Date: 2015-04-17 08:11:53 UTC
  • mfrom: (3503.2.322 maas)
  • Revision ID: gavin.panella@canonical.com-20150417081153-zdygntehm3o8vnr9
Merge trunk, resolving lots of conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maas/tests/test_maas.py
28
28
    find_settings,
29
29
    import_local_settings,
30
30
    import_settings,
31
 
    )
 
31
)
32
32
from maastesting.djangotestcase import DjangoTestCase
33
33
from maastesting.factory import factory
34
 
from psycopg2.extensions import ISOLATION_LEVEL_SERIALIZABLE
 
34
from psycopg2.extensions import ISOLATION_LEVEL_REPEATABLE_READ
35
35
from testtools.matchers import (
36
36
    ContainsDict,
37
37
    Equals,
38
38
    Is,
39
 
    )
 
39
)
40
40
 
41
41
 
42
42
class TestSettingsHelpers(DjangoTestCase):
128
128
                "default": ContainsDict({
129
129
                    "OPTIONS": ContainsDict({
130
130
                        "isolation_level": Equals(
131
 
                            ISOLATION_LEVEL_SERIALIZABLE),
 
131
                            ISOLATION_LEVEL_REPEATABLE_READ),
132
132
                    }),
133
133
                }),
134
134
            }),