diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-26 14:19:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-26 14:19:34 +0000 |
| commit | 5d15fe76314976f54572f35292de4a8b85c778e9 (patch) | |
| tree | 25cc98bc0d2569caffee7a85825f9c99c33dae4a /tests | |
| parent | f19e4c6e78dd4f171549f2554dfe14f78305b702 (diff) | |
| parent | 71f1c89b657491f694095a0bc20828e09bfbc9ca (diff) | |
| download | python-jenkins-job-builder-5d15fe76314976f54572f35292de4a8b85c778e9.tar.gz python-jenkins-job-builder-5d15fe76314976f54572f35292de4a8b85c778e9.tar.xz python-jenkins-job-builder-5d15fe76314976f54572f35292de4a8b85c778e9.zip | |
Merge "remove support of old plugin config format"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cmd/fixtures/plugin_warning.ini | 3 | ||||
| -rw-r--r-- | tests/cmd/test_config.py | 27 | ||||
| -rw-r--r-- | tests/publishers/fixtures/stash002.conf | 2 |
3 files changed, 1 insertions, 31 deletions
diff --git a/tests/cmd/fixtures/plugin_warning.ini b/tests/cmd/fixtures/plugin_warning.ini index 58ae8909..87f9cfda 100644 --- a/tests/cmd/fixtures/plugin_warning.ini +++ b/tests/cmd/fixtures/plugin_warning.ini @@ -1,5 +1,2 @@ -[old_plugin] -setting = some value - [plugin "new_plugin"] setting = some value diff --git a/tests/cmd/test_config.py b/tests/cmd/test_config.py index 8b2eee7d..6cbb6d4d 100644 --- a/tests/cmd/test_config.py +++ b/tests/cmd/test_config.py @@ -77,33 +77,6 @@ class TestConfigs(CmdTestsBase): jenkins_jobs = entry.JenkinsJobs(args) self.assertRaises(IOError, jenkins_jobs.execute) - def test_config_old_plugin_format_warning(self): - """ - Run test mode and check that old plugin settings result - in a warning, while ensuring that missing sections do not - trigger the same warning if a default value is provided. - """ - args = ['--conf', - os.path.join(self.fixtures_path, 'plugin_warning.ini'), - 'test', 'foo'] - jenkins_jobs = entry.JenkinsJobs(args) - jenkins_jobs.jjb_config.get_plugin_config( - 'old_plugin', 'setting', True) - jenkins_jobs.jjb_config.get_plugin_config( - 'old_plugin_no_conf', 'setting', True) - jenkins_jobs.jjb_config.get_plugin_config( - 'new_plugin', 'setting') - self.assertIn( - 'using a [old_plugin] section in your config file is deprecated', - self.logger.output) - self.assertNotIn( - 'using a [old_plugin_no_conf] secton in your config file is ' - 'deprecated', - self.logger.output) - self.assertNotIn( - 'using a [new_plugin] section in your config file is deprecated', - self.logger.output) - def test_config_options_not_replaced_by_cli_defaults(self): """ Run test mode and check config settings from conf file retained diff --git a/tests/publishers/fixtures/stash002.conf b/tests/publishers/fixtures/stash002.conf index 8df10973..cccdcf25 100644 --- a/tests/publishers/fixtures/stash002.conf +++ b/tests/publishers/fixtures/stash002.conf @@ -1,3 +1,3 @@ -[stash] +[plugin "stash"] username=user password=pass |