← Back to branch summary

~allenap/maas/xxx-a-thon

« back to all changes in this revision

Viewing changes to src/maasserver/websockets/handlers/tests/test_controller.py

  • Committer: LaMont Jones
  • Date: 2016-03-07 23:20:52 UTC
  • mfrom: (4657.1.84 maas)
  • mto: (4657.1.93 maas)
  • mto: This revision was merged to the branch mainline in revision 4660.
  • Revision ID: lamont@canonical.com-20160307232052-rgfxbq7dujj6s093
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/websockets/handlers/tests/test_controller.py
6
6
__all__ = []
7
7
 
8
8
from maasserver.enum import NODE_TYPE
9
 
from maasserver.forms import AdminNodeWithMACAddressesForm
 
9
from maasserver.forms import AdminMachineWithMACAddressesForm
10
10
from maasserver.testing.factory import factory
11
11
from maasserver.testing.testcase import MAASServerTestCase
12
12
from maasserver.websockets.handlers.controller import ControllerHandler
63
63
        user = factory.make_admin()
64
64
        handler = ControllerHandler(user, {})
65
65
        self.assertEqual(
66
 
            AdminNodeWithMACAddressesForm,
 
66
            AdminMachineWithMACAddressesForm,
67
67
            handler.get_form_class("create"))
68
68
 
69
69
    def test_get_form_class_for_update(self):
70
70
        user = factory.make_admin()
71
71
        handler = ControllerHandler(user, {})
72
72
        self.assertEqual(
73
 
            AdminNodeWithMACAddressesForm,
 
73
            AdminMachineWithMACAddressesForm,
74
74
            handler.get_form_class("update"))