hacking: Make check for duplicate clients less specific

Change-Id: Ie08a09c209d24d54b062a44e5b535c8a2926285c
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Author: stephenfin

hacking/checks.py

@@ -55,7 +55,7 @@ def assert_no_duplicated_setup(logical_line, filename):
 
     if os.path.basename(filename) != 'fakes.py':
         if re.match(
-            r'self.[a-z_]+_client = self.app.client_manager.*', logical_line
+            r'self.[a-zA-Z0-9_]+ = self.app.client_manager.*', logical_line
         ):
             yield (
                 0,

openstackclient/tests/unit/network/v2/test_network_qos_policy.py

@@ -28,7 +28,7 @@ class TestQosPolicy(network_fakes.TestNetworkV2):
     def setUp(self):
         super().setUp()
         # Get a shortcut to the ProjectManager Mock
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
 
 
 class TestCreateNetworkQosPolicy(TestQosPolicy):

openstackclient/tests/unit/volume/v3/test_volume_attachment.py

@@ -23,7 +23,7 @@ class TestVolumeAttachment(volume_fakes.TestVolume):
     def setUp(self):
         super().setUp()
 
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
 
 
 class TestVolumeAttachmentCreate(TestVolumeAttachment):