diff --git a/swh/core/tests/test_config.py b/swh/core/tests/test_config.py --- a/swh/core/tests/test_config.py +++ b/swh/core/tests/test_config.py @@ -103,28 +103,28 @@ res = config.read(self.conffile, self.default_conf) # then - self.assertEquals(res, self.parsed_conffile) + self.assertEqual(res, self.parsed_conffile) def test_read_empty_file(self): # when res = config.read(None, self.default_conf) # then - self.assertEquals(res, self.parsed_default_conf) + self.assertEqual(res, self.parsed_default_conf) def test_support_non_existing_conffile(self): # when res = config.read(self.non_existing_conffile, self.default_conf) # then - self.assertEquals(res, self.parsed_default_conf) + self.assertEqual(res, self.parsed_default_conf) def test_support_empty_conffile(self): # when res = config.read(self.empty_conffile, self.default_conf) # then - self.assertEquals(res, self.parsed_default_conf) + self.assertEqual(res, self.parsed_default_conf) def test_raise_on_broken_directory_perms(self): with self.assertRaises(PermissionError): @@ -140,7 +140,7 @@ self.other_default_conf) # then - self.assertEquals(res, self.full_default_conf) + self.assertEqual(res, self.full_default_conf) def test_priority_read_nonexist_conf(self): # when @@ -148,7 +148,7 @@ self.default_conf) # then - self.assertEquals(res, self.parsed_conffile) + self.assertEqual(res, self.parsed_conffile) def test_priority_read_conf_nonexist_empty(self): # when @@ -159,7 +159,7 @@ ], self.default_conf) # then - self.assertEquals(res, self.parsed_conffile) + self.assertEqual(res, self.parsed_conffile) def test_priority_read_empty_conf_nonexist(self): # when @@ -170,7 +170,7 @@ ], self.default_conf) # then - self.assertEquals(res, self.parsed_default_conf) + self.assertEqual(res, self.parsed_default_conf) def test_swh_config_paths(self): res = config.swh_config_paths('foo/bar.ini') diff --git a/swh/core/tests/test_logger.py b/swh/core/tests/test_logger.py --- a/swh/core/tests/test_logger.py +++ b/swh/core/tests/test_logger.py @@ -33,7 +33,7 @@ def test_log(self): self.logger.info('notice', extra={'swh_type': 'test entry', 'swh_data': 42}) - self.logger.warn('warning') + self.logger.warning('warning') with self.conn.cursor() as cur: cur.execute('SELECT level, message, data, src_module FROM log') diff --git a/swh/core/tests/test_utils.py b/swh/core/tests/test_utils.py --- a/swh/core/tests/test_utils.py +++ b/swh/core/tests/test_utils.py @@ -34,19 +34,19 @@ with self.assertRaises(UnicodeDecodeError): raw_data_err.decode('utf-8', 'strict') - self.assertEquals( + self.assertEqual( raw_data_err.decode('utf-8', 'backslashescape'), 'abcd\\x80', ) raw_data_ok = b'abcd\xc3\xa9' - self.assertEquals( + self.assertEqual( raw_data_ok.decode('utf-8', 'backslashescape'), raw_data_ok.decode('utf-8', 'strict'), ) unicode_data = 'abcdef\u00a3' - self.assertEquals( + self.assertEqual( unicode_data.encode('ascii', 'backslashescape'), b'abcdef\\xa3', ) @@ -55,7 +55,7 @@ valid_data = '\\x01020304\\x00' valid_data_encoded = b'\x01020304\x00' - self.assertEquals( + self.assertEqual( valid_data_encoded, utils.encode_with_unescape(valid_data) ) @@ -73,7 +73,7 @@ backslashes = b'foo\\bar\\\\baz' backslashes_escaped = 'foo\\\\bar\\\\\\\\baz' - self.assertEquals( + self.assertEqual( backslashes_escaped, utils.decode_with_escape(backslashes), ) @@ -81,7 +81,7 @@ valid_utf8 = b'foo\xc3\xa2' valid_utf8_escaped = 'foo\u00e2' - self.assertEquals( + self.assertEqual( valid_utf8_escaped, utils.decode_with_escape(valid_utf8), ) @@ -89,7 +89,7 @@ invalid_utf8 = b'foo\xa2' invalid_utf8_escaped = 'foo\\xa2' - self.assertEquals( + self.assertEqual( invalid_utf8_escaped, utils.decode_with_escape(invalid_utf8), ) @@ -97,7 +97,7 @@ valid_utf8_nul = b'foo\xc3\xa2\x00' valid_utf8_nul_escaped = 'foo\u00e2\\x00' - self.assertEquals( + self.assertEqual( valid_utf8_nul_escaped, utils.decode_with_escape(valid_utf8_nul), ) @@ -107,10 +107,10 @@ actual_commonname = utils.commonname('/some/where/to/', '/some/where/to/go/to') # then - self.assertEquals('go/to', actual_commonname) + self.assertEqual('go/to', actual_commonname) # when actual_commonname2 = utils.commonname(b'/some/where/to/', b'/some/where/to/go/to') # then - self.assertEquals(b'go/to', actual_commonname2) + self.assertEqual(b'go/to', actual_commonname2) diff --git a/tox.ini b/tox.ini --- a/tox.ini +++ b/tox.ini @@ -4,10 +4,10 @@ [testenv:py3] deps = -r requirements-test.txt - coverage + pytest-cov pifpaf commands = - pifpaf run postgresql -- pytest {posargs} + pifpaf run postgresql -- pytest --cov=swh --cov-branch {posargs} [testenv:flake8] skip_install = true