diff --git a/tests/test_config.py b/tests/test_config.py index 1d970022..8cb1aa63 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -979,8 +979,8 @@ def testLineContinuationInConfig(self): self.assertEqual(config["server"], 'http://1.2.3.4\nvalue') - @patch('logging.Logger.warn') - def testCommentedOutLineContinuationInConfig(self, logger_warn): + @patch('logging.Logger.warning') + def testCommentedOutLineContinuationInConfig(self, logger_warning): """Test that when a config line that starts with space or tab which is followed by a '#', if we are running python2: it is treated as a continuation of the previous line, but a warning is logged for the user. @@ -1003,8 +1003,8 @@ def testCommentedOutLineContinuationInConfig(self, logger_warn): config = manager.configs[0][1] self.assertEqual(config.name, "test1") self.assertEqual(config["server"], "http://1.2.3.4") - self.assertFalse(logger_warn.called) - self.assertEqual(logger_warn.call_count, 0) + self.assertFalse(logger_warning.called) + self.assertEqual(logger_warning.call_count, 0) class TestParseList(TestBase): diff --git a/virtwho/config.py b/virtwho/config.py index 602e0da8..65476636 100644 --- a/virtwho/config.py +++ b/virtwho/config.py @@ -402,7 +402,7 @@ def parse_file(filename): except InvalidOption as e: # When a configuration section has an Invalid Option, continue # See https://bugzilla.redhat.com/show_bug.cgi?id=1457101 for more info - logger.warn("Invalid configuration detected: %s", str(e)) + logger.warning("Invalid configuration detected: %s", str(e)) except DuplicateOptionError as e: logger.warning(str(e)) except Exception as e: @@ -1342,15 +1342,15 @@ def all_drop_dir_config_sections(config_dir=VW_CONF_DIR): conf_files = set(s for s in all_dir_content if s.endswith('.conf')) non_conf_files = all_dir_content - conf_files except OSError: - logger.warn("Configuration directory '%s' doesn't exist or is not accessible", - config_dir) + logger.warning("Configuration directory '%s' doesn't exist or is not accessible", + config_dir) return {} if not all_dir_content: - logger.warn("Configuration directory '%s' appears empty", config_dir) + logger.warning("Configuration directory '%s' appears empty", config_dir) elif not conf_files: - logger.warn("Configuration directory '%s' does not have any '*.conf' files but " - "is not empty", config_dir) + logger.warning("Configuration directory '%s' does not have any '*.conf' files but " + "is not empty", config_dir) elif non_conf_files: logger.debug("There are files in '%s' not ending in '*.conf' is this " "intentional?", config_dir) @@ -1372,8 +1372,8 @@ def has_config_files_in_drop_dir(config_dir=VW_CONF_DIR): all_dir_content = set(os.listdir(config_dir)) conf_files = set(s for s in all_dir_content if s.endswith('.conf')) except OSError: - logger.warn("Configuration directory '%s' doesn't exist or is not accessible", - config_dir) + logger.warning("Configuration directory '%s' doesn't exist or is not accessible", + config_dir) return False if not conf_files: diff --git a/virtwho/manager/satellite/satellite.py b/virtwho/manager/satellite/satellite.py index 5fe5fb87..8fd7192a 100644 --- a/virtwho/manager/satellite/satellite.py +++ b/virtwho/manager/satellite/satellite.py @@ -238,7 +238,7 @@ def hypervisorCheckIn(self, report, options=None): self.server_xmlrpc.registration.virt_notify(hypervisor_systemid["system_id"], plan) except xmlrpc.client.Fault as e: if e.faultCode == -9: - self.logger.warn("System was deleted from Satellite 5, reregistering") + self.logger.warning("System was deleted from Satellite 5, re-registering") hypervisor_systemid = self._load_hypervisor(hypervisor.hypervisorId, hypervisor_type=report.config['type'], force=True) self.server_xmlrpc.registration.virt_notify(hypervisor_systemid["system_id"], plan)