Merge ~adam-collard/maas:unskip-num-query-controller-test into maas:master

[Adam Collard]

Un-skip the query count test for controllers

[Alberto Donato (ack)]

+1

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b unskip-num-query-controller-test 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/8957/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b unskip-num-query-controller-test 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/8958/console
COMMIT: d77bfaf8c365876dd72f36b229cc7c7e1504a35a

review: Needs Fixing

7703426... by Adam Collard on 2021-01-04

Lint: remove unused import

diff --git a/src/maasserver/websockets/handlers/tests/test_controller.py b/src/maasserver/websockets/handlers/tests/test_controller.py
index 873fff1..5281f75 100644
--- a/src/maasserver/websockets/handlers/tests/test_controller.py
+++ b/src/maasserver/websockets/handlers/tests/test_controller.py
@@ -4,8 +4,6 @@
 """Tests for `maasserver.websockets.handlers.controller`"""
 
 
-from unittest import skip
-
 from testscenarios import multiply_scenarios
 from testtools.matchers import ContainsDict, Equals
 
@@ -117,7 +115,6 @@ class TestControllerHandler(MAASServerTestCase):
             "Number of queries has changed; make sure this is expected.",
         )
 
-    @skip("XXX: ltrager 2919-11-29 bug=1854546")
     def test_get_num_queries_is_the_expected_number(self):
         owner = factory.make_admin()
         node = factory.make_RegionRackController(owner=owner)
@@ -148,7 +145,7 @@ class TestControllerHandler(MAASServerTestCase):
         # and slowing down the client waiting for the response.
         self.assertEqual(
             queries,
-            36,
+            35,
             "Number of queries has changed; make sure this is expected.",
         )