summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSorin Sbarnea <ssbarnea@redhat.com>2018-07-16 16:37:06 +0100
committerThanh Ha <zxiiro@gmail.com>2019-04-16 09:08:05 +0800
commit71f1c89b657491f694095a0bc20828e09bfbc9ca (patch)
treedc05fe53d383b633a0a39ce20c7f11a1bd92587f /tests
parent1e24fceea191b72bd752df65982498816e0744e5 (diff)
downloadpython-jenkins-job-builder-71f1c89b657491f694095a0bc20828e09bfbc9ca.tar.gz
python-jenkins-job-builder-71f1c89b657491f694095a0bc20828e09bfbc9ca.tar.xz
python-jenkins-job-builder-71f1c89b657491f694095a0bc20828e09bfbc9ca.zip
remove support of old plugin config format
Remove code refering to old plugin config format. Change-Id: Iba0922d3bfe066444e5e982c303968d15e1853a1
Diffstat (limited to 'tests')
-rw-r--r--tests/cmd/fixtures/plugin_warning.ini3
-rw-r--r--tests/cmd/test_config.py27
-rw-r--r--tests/publishers/fixtures/stash002.conf2
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