Merge ~r00ta/maas:cleanup-runtimeerorr-import into maas:master

[Jacopo Rota]

refactor: cleanup imports in test_dhcp

Remove leftover `import builtins`

[Anton Troyanov (troyanov)]

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b cleanup-runtimeerorr-import lp:~r00ta/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/3646/console
COMMIT: 21a05fb6543a375483a516517c03b37387cfdfec

review: Needs Fixing

52e7288... by Jacopo Rota on 2023-09-27

lint

[Dima Tisnek (dimaqq)]

LGTM

[MAAS Lander (maas-lander)]

UNIT TESTS
-b cleanup-runtimeerorr-import lp:~r00ta/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 52e7288e014b21cb5521272d060630f7081717ec

review: Approve

diff --git a/src/maasserver/tests/test_dhcp.py b/src/maasserver/tests/test_dhcp.py
index 1f6dab3..346a808 100644
--- a/src/maasserver/tests/test_dhcp.py
+++ b/src/maasserver/tests/test_dhcp.py
@@ -1,6 +1,5 @@
 # Copyright 2012-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
-import builtins
 from datetime import datetime
 from operator import itemgetter
 import random
@@ -2858,15 +2857,13 @@ class TestConfigureDHCP(MAASTransactionServerTestCase):
         client = yield getClientFor(rack_controller.system_id)
         self.patch(
             client._conn, "_sendBoxCommand"
-        ).side_effect = always_fail_with(
-            builtins.RuntimeError("the handler is closed")
-        )
+        ).side_effect = always_fail_with(RuntimeError("the handler is closed"))
 
         ipv4_stub.side_effect = always_succeed_with({})
         ipv6_stub.side_effect = always_succeed_with({})
 
-        # The builtins.RuntimeError is propagated
-        with pytest.raises(builtins.RuntimeError):
+        # The RuntimeError is propagated
+        with pytest.raises(RuntimeError):
             yield dhcp.configure_dhcp(rack_controller)
 
         # But the connection should have been closed and no connections should be available now.