From 5dfa48ecf39b49f09a6ee5063474308961029a5a Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Nov 22 2018 08:34:21 +0000 Subject: Fix deprecation warnings for call to test assertions Signed-off-by: Chenxiong Qi --- diff --git a/tests/test_brew_container_task_state_change_handler.py b/tests/test_brew_container_task_state_change_handler.py index e9f5f16..b378f9a 100644 --- a/tests/test_brew_container_task_state_change_handler.py +++ b/tests/test_brew_container_task_state_change_handler.py @@ -22,6 +22,7 @@ import json import mock import os +import six import sys import unittest @@ -259,7 +260,7 @@ class TestBrewContainerTaskStateChangeHandler(helpers.ModelsTestCase): self.handler.handle(event) self.assertEqual(build.state, ArtifactBuildState.FAILED.value) - self.assertRegexpMatches(build.state_reason, r"The following RPMs in container build.*") + six.assertRegex(self, build.state_reason, r"The following RPMs in container build.*") if __name__ == '__main__': diff --git a/tests/test_errata_advisory_state_changed.py b/tests/test_errata_advisory_state_changed.py index 04b3fe0..88cfe8c 100644 --- a/tests/test_errata_advisory_state_changed.py +++ b/tests/test_errata_advisory_state_changed.py @@ -22,6 +22,7 @@ # Written by Chenxiong Qi import json +import six from mock import patch, PropertyMock, Mock, call @@ -57,7 +58,8 @@ class TestFindBuildSrpmName(helpers.FreshmakerTestCase): handler = ErrataAdvisoryRPMsSignedHandler() - self.assertRaisesRegexp( + six.assertRaisesRegex( + self, ValueError, 'Build bind-dyndb-ldap-2.3-8.el6 does not have a SRPM', handler._find_build_srpm_name,