Fix linting errors; fix some real bugs (#5111) (#5115)

* Fix linting errors.

* Fix bugs.

* Another linter error ignored.

* More fixes.

* Ignore sanity errors with older versions.

ci_complete

* Forgot to commit more changes.

(cherry picked from commit a54af8909c)

tests/integration/targets/mail/files/smtpserver.py

@@ -61,7 +61,7 @@ if HAS_TLS and ssl_ctx is not None:
         smtp_server2 = smtpd_tls.DebuggingServer(('127.0.0.1', port2), None, ssl_ctx=ssl_ctx, starttls=False)
 else:
     print('Start SMTP server on port', port1)
-    smtp_server1 = smtpd.DebuggingServer(('127.0.0.1', port1), None)
+    smtp_server1 = smtpd.DebuggingServer(('127.0.0.1', port1), None)  # pylint: disable=used-before-assignment
     if port2:
         print('WARNING: TLS is NOT supported on this system, not listening on port %s.' % port2)
 

tests/sanity/ignore-2.10.txt

@@ -24,6 +24,7 @@ plugins/modules/cloud/univention/udm_user.py validate-modules:parameter-list-no-
 plugins/modules/clustering/consul/consul.py validate-modules:doc-missing-type
 plugins/modules/clustering/consul/consul.py validate-modules:undocumented-parameter
 plugins/modules/clustering/consul/consul_session.py validate-modules:parameter-state-invalid-choice
+plugins/modules/files/ini_file.py pylint:bad-option-value
 plugins/modules/packaging/language/composer.py validate-modules:parameter-invalid   # invalid alias - removed in 5.0.0
 plugins/modules/packaging/language/yarn.py use-argspec-type-path
 plugins/modules/packaging/os/apt_rpm.py validate-modules:parameter-invalid   # invalid alias - removed in 5.0.0

tests/sanity/ignore-2.11.txt

@@ -23,6 +23,7 @@ plugins/modules/cloud/univention/udm_user.py validate-modules:parameter-list-no-
 plugins/modules/clustering/consul/consul.py validate-modules:doc-missing-type
 plugins/modules/clustering/consul/consul.py validate-modules:undocumented-parameter
 plugins/modules/clustering/consul/consul_session.py validate-modules:parameter-state-invalid-choice
+plugins/modules/files/ini_file.py pylint:bad-option-value
 plugins/modules/packaging/language/composer.py validate-modules:parameter-invalid   # invalid alias - removed in 5.0.0
 plugins/modules/packaging/language/yarn.py use-argspec-type-path
 plugins/modules/packaging/os/apt_rpm.py validate-modules:parameter-invalid   # invalid alias - removed in 5.0.0

tests/sanity/ignore-2.12.txt

@@ -18,6 +18,7 @@ plugins/modules/cloud/univention/udm_user.py validate-modules:parameter-list-no-
 plugins/modules/clustering/consul/consul.py validate-modules:doc-missing-type
 plugins/modules/clustering/consul/consul.py validate-modules:undocumented-parameter
 plugins/modules/clustering/consul/consul_session.py validate-modules:parameter-state-invalid-choice
+plugins/modules/files/ini_file.py pylint:bad-option-value
 plugins/modules/packaging/language/composer.py validate-modules:parameter-invalid   # invalid alias - removed in 5.0.0
 plugins/modules/packaging/language/yarn.py use-argspec-type-path
 plugins/modules/packaging/os/apt_rpm.py validate-modules:parameter-invalid   # invalid alias - removed in 5.0.0

tests/sanity/ignore-2.13.txt

@@ -18,6 +18,7 @@ plugins/modules/cloud/univention/udm_user.py validate-modules:parameter-list-no-
 plugins/modules/clustering/consul/consul.py validate-modules:doc-missing-type
 plugins/modules/clustering/consul/consul.py validate-modules:undocumented-parameter
 plugins/modules/clustering/consul/consul_session.py validate-modules:parameter-state-invalid-choice
+plugins/modules/files/ini_file.py pylint:bad-option-value
 plugins/modules/packaging/language/composer.py validate-modules:parameter-invalid   # invalid alias - removed in 5.0.0
 plugins/modules/packaging/language/yarn.py use-argspec-type-path
 plugins/modules/packaging/os/apt_rpm.py validate-modules:parameter-invalid   # invalid alias - removed in 5.0.0

tests/sanity/ignore-2.9.txt

@@ -18,6 +18,7 @@ plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:para
 plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:undocumented-parameter
 plugins/modules/clustering/consul/consul.py validate-modules:doc-missing-type
 plugins/modules/clustering/consul/consul.py validate-modules:undocumented-parameter
+plugins/modules/files/ini_file.py pylint:bad-option-value
 plugins/modules/packaging/language/composer.py validate-modules:parameter-invalid   # invalid alias - removed in 5.0.0
 plugins/modules/packaging/language/yarn.py use-argspec-type-path
 plugins/modules/packaging/os/apt_rpm.py validate-modules:parameter-invalid   # invalid alias - removed in 5.0.0

tests/unit/plugins/modules/remote_management/lxca/test_lxca_cmms.py

@@ -73,8 +73,8 @@ class TestMyModule():
         }
         mod_obj.params = args
         lxca_cmms.main()
-        assert(mock.call(argument_spec=expected_arguments_spec,
-                         supports_check_mode=False) == ansible_mod_cls.call_args)
+        assert mock.call(argument_spec=expected_arguments_spec,
+                         supports_check_mode=False) == ansible_mod_cls.call_args
 
     @mock.patch('ansible_collections.community.general.plugins.module_utils.remote_management.lxca.common.setup_conn', autospec=True)
     @mock.patch('ansible_collections.community.general.plugins.modules.remote_management.lxca.lxca_cmms._cmms_by_uuid',

tests/unit/plugins/modules/remote_management/lxca/test_lxca_nodes.py

@@ -77,8 +77,8 @@ class TestMyModule():
         }
         mod_obj.params = args
         lxca_nodes.main()
-        assert(mock.call(argument_spec=expected_arguments_spec,
-                         supports_check_mode=False) == ansible_mod_cls.call_args)
+        assert mock.call(argument_spec=expected_arguments_spec,
+                         supports_check_mode=False) == ansible_mod_cls.call_args
 
     @mock.patch('ansible_collections.community.general.plugins.module_utils.remote_management.lxca.common.setup_conn', autospec=True)
     @mock.patch('ansible_collections.community.general.plugins.modules.remote_management.lxca.lxca_nodes._nodes_by_uuid',

tests/unit/plugins/modules/storage/pmem/test_pmem.py

@@ -314,9 +314,9 @@ class TestPmem(ModuleTestCase):
         test_result = result.exception.args[0]['result']
         expected = json.loads(namespace)
 
-        for i, notuse in enumerate(test_result):
-            self.assertEqual(test_result[i]['dev'], expected[i]['dev'])
-            self.assertEqual(test_result[i]['size'], expected[i]['size'])
+        for i, result in enumerate(test_result):
+            self.assertEqual(result['dev'], expected[i]['dev'])
+            self.assertEqual(result['size'], expected[i]['size'])
 
     def test_fail_when_required_args_missing(self):
         with self.assertRaises(AnsibleFailJson):