Merge ~adam-collard/maas:unstringify-test_blockdevice into maas:master

[Adam Collard]

Remove the triple quotes that were effectively ignoring tests.

[Lee Trager (ltrager)]

LGTM!

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b unstringify-test_blockdevice lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/8902/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b unstringify-test_blockdevice lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/8904/console
COMMIT: 45f24c372675c15d69165813ccafdd021fc70061

review: Needs Fixing

diff --git a/src/maasserver/api/tests/test_blockdevice.py b/src/maasserver/api/tests/test_blockdevice.py
index 8329df7..e03ecea 100644
--- a/src/maasserver/api/tests/test_blockdevice.py
+++ b/src/maasserver/api/tests/test_blockdevice.py
@@ -1183,51 +1183,66 @@ class TestBlockDeviceAPI(APITestCase.ForUser):
             http.client.CONFLICT, response.status_code, response.content
         )
 
-    """
     def test_set_boot_disk_returns_400_for_virtual_device(self):
         self.become_admin()
-        node = factory.make_Node(owner=self.user)
+        node = factory.make_Node(status=NODE_STATUS.READY, owner=self.user)
         block_device = factory.make_VirtualBlockDevice(node=node)
         uri = get_blockdevice_uri(block_device)
-        response = self.client.post(uri, {
-            'op': "set_boot_disk",
-        })
+        response = self.client.post(
+            uri,
+            {
+                "op": "set_boot_disk",
+            },
+        )
+        self.assertEqual(
+            http.client.BAD_REQUEST, response.status_code, response.content
+        )
         self.assertEqual(
-            httplib.BAD_REQUEST, response.status_code, response.content)
-        self.assertEquals(
-            "Cannot set a virtual block device as the boot disk.",
-            response.content)
+            b"Cannot set a virtual block device as the boot disk.",
+            response.content,
+        )
 
     def test_set_boot_disk_returns_403_for_normal_user(self):
-        node = factory.make_Node(owner=self.user)
+        node = factory.make_Node(status=NODE_STATUS.READY, owner=self.user)
         block_device = factory.make_PhysicalBlockDevice(node=node)
         uri = get_blockdevice_uri(block_device)
-        response = self.client.post(uri, {
-            'op': "set_boot_disk",
-        })
+        response = self.client.post(
+            uri,
+            {
+                "op": "set_boot_disk",
+            },
+        )
         self.assertEqual(
-            httplib.FORBIDDEN, response.status_code, response.content)
+            http.client.FORBIDDEN, response.status_code, response.content
+        )
 
     def test_set_boot_disk_returns_404_for_block_device_not_on_node(self):
         node = factory.make_Node(owner=self.user)
         block_device = factory.make_PhysicalBlockDevice()
         uri = get_blockdevice_uri(block_device, node=node)
-        response = self.client.post(uri, {
-            'op': "set_boot_disk",
-        })
+        response = self.client.post(
+            uri,
+            {
+                "op": "set_boot_disk",
+            },
+        )
         self.assertEqual(
-            httplib.NOT_FOUND, response.status_code, response.content)
+            http.client.NOT_FOUND, response.status_code, response.content
+        )
 
     def test_set_boot_disk_sets_boot_disk_for_admin(self):
         self.become_admin()
-        node = factory.make_Node(owner=self.user)
+        node = factory.make_Node(status=NODE_STATUS.READY, owner=self.user)
         block_device = factory.make_PhysicalBlockDevice(node=node)
         uri = get_blockdevice_uri(block_device)
-        response = self.client.post(uri, {
-            'op': "set_boot_disk",
-        })
+        response = self.client.post(
+            uri,
+            {
+                "op": "set_boot_disk",
+            },
+        )
         self.assertEqual(
-            httplib.OK, response.status_code, response.content)
+            http.client.OK, response.status_code, response.content
+        )
         node = reload_object(node)
-        self.assertEquals(block_device, node.boot_disk)
-    """
+        self.assertEqual(block_device, node.boot_disk)