From 71f1c89b657491f694095a0bc20828e09bfbc9ca Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Mon, 16 Jul 2018 16:37:06 +0100
Subject: remove support of old plugin config format

Remove code refering to old plugin config format.

Change-Id: Iba0922d3bfe066444e5e982c303968d15e1853a1
---
 tests/cmd/fixtures/plugin_warning.ini   |  3 ---
 tests/cmd/test_config.py                | 27 ---------------------------
 tests/publishers/fixtures/stash002.conf |  2 +-
 3 files changed, 1 insertion(+), 31 deletions(-)

(limited to 'tests')

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
-- 
cgit