launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #12554
[Merge] lp:~jtv/maas/linty-linty into lp:maas
Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/linty-linty into lp:maas.
Commit message:
Lint.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~jtv/maas/linty-linty/+merge/126642
--
https://code.launchpad.net/~jtv/maas/linty-linty/+merge/126642
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/linty-linty into lp:maas.
=== modified file 'src/maasserver/tests/test_tag.py'
--- src/maasserver/tests/test_tag.py 2012-09-26 12:26:54 +0000
+++ src/maasserver/tests/test_tag.py 2012-09-27 09:33:24 +0000
@@ -14,11 +14,10 @@
from django.db import transaction
from django.db.utils import DatabaseError
-from maastesting.djangotestcase import TransactionTestCase
-from maasserver.enum import NODE_STATUS
from maasserver.models import Tag
from maasserver.testing.factory import factory
from maasserver.testing.testcase import TestCase
+from maastesting.djangotestcase import TransactionTestCase
class TagTest(TestCase):
@@ -129,6 +128,7 @@
transaction.commit()
return tag, node
tag, node = setup()
+
@transaction.commit_manually
def trigger_invalid():
tag.definition = 'invalid::tag'