From 28d00a0e282fd4714554e7c168eb076799738096 Mon Sep 17 00:00:00 2001 From: Vsevolod Fedorov Date: Mon, 11 Jul 2022 12:36:37 +0300 Subject: [PATCH] Update jenkins_manager/test_manager test After JJB internals are changed, some of the tests became unuseful. Change-Id: Ib5583d77bd2c4fc5ef31d5062029f047e8e94fd4 --- tests/jenkins_manager/test_manager.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/jenkins_manager/test_manager.py b/tests/jenkins_manager/test_manager.py index 53bcf990e..ddde7eac0 100644 --- a/tests/jenkins_manager/test_manager.py +++ b/tests/jenkins_manager/test_manager.py @@ -45,17 +45,13 @@ def test_plugins_list_from_jenkins(mocker, jjb_config): jenkins_jobs.builder.jenkins.Jenkins, "get_plugins", return_value=_plugins_info ) # Trigger fetching the plugins from jenkins when accessing the property - jjb_config.builder["plugins_info"] = {} + jjb_config.builder["plugins_info"] = None builder = jenkins_jobs.builder.JenkinsManager(jjb_config) - # See https://github.com/formiaczek/multi_key_dict/issues/17 - # self.assertEqual(self.builder.plugins_list, k) - for key_tuple in builder.plugins_list.keys(): - for key in key_tuple: - assert builder.plugins_list[key] == _plugins_info[key] + assert list(builder.plugins_list) == list(_plugins_info.values()) def test_delete_managed(mocker, jjb_config): - jjb_config.builder["plugins_info"] = {} + jjb_config.builder["plugins_info"] = None builder = jenkins_jobs.builder.JenkinsManager(jjb_config) patches = mocker.patch.multiple(