From e00f54e7e82fd7fe6c9d4f35a9177d59a8bead30 Mon Sep 17 00:00:00 2001 From: Takashi NATSUME Date: Thu, 18 Oct 2018 21:56:04 +0900 Subject: [PATCH] Use assertRegex instead of assertRegexpMatches In Python3, assertRegexpMatches & assertNotRegexpMatches are deprecated in favor of assertRegex and assertNotRegex. Change-Id: Ifd7cb0d548431095294ad40c99703604f0022888 Closes-Bug: #1798594 --- nova/tests/functional/test_nova_manage.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nova/tests/functional/test_nova_manage.py b/nova/tests/functional/test_nova_manage.py index 3bd931d452fb..4af7a6556aee 100644 --- a/nova/tests/functional/test_nova_manage.py +++ b/nova/tests/functional/test_nova_manage.py @@ -775,8 +775,8 @@ class TestDBArchiveDeletedRows(integrated_helpers._IntegratedTestBase): # Now archive. self.cli.archive_deleted_rows(verbose=True) # Assert only one instance_group_member record was deleted. - self.assertRegexpMatches(self.output.getvalue(), - ".*instance_group_member.*\| 1.*") + self.assertRegex(self.output.getvalue(), + ".*instance_group_member.*\| 1.*") # And that we still have one remaining group member. self.assertEqual( 1, len(self.api.get_server_group(group['id'])['members']))