[stable-1] Update CI (#1790)

* Update CI (#1782)

* Update targets for CI for devel branch; move some targets to stable-2.10.

* Skipping test on RHEL 8.3 (it is already skipped on RHEL 8.2).

* Linting.

* Shut 2.9/2.10 pylint complaints up.

* More sanity.

* Bump CI to FreeBSD 11.4, 12.2. (#1657)

* Bump CI to FreeBSD 11.4, 12.2.

* Make FreeBSD Python package selection more future-proof.

(cherry picked from commit c1eb0a232c)

* Add macOS 11.1 tests (#1619)

* Add macOS 11.1 tests.

* Hopefully fix virtualenv.sh problems.

(cherry picked from commit 74174f11ff)

* Skip all postgresql tests on FreeBSD.

* Skip kubevirt inventory tests on macOS.

tests/unit/plugins/module_utils/postgresql/test_postgres.py

@@ -225,8 +225,8 @@ class TestConnectToDb():
         db_connection = pg.connect_to_db(m_ansible_module, conn_params)
         cursor = db_connection.cursor()
         # if errors, db_connection returned as None:
-        assert isinstance(db_connection, DbConnection)
-        assert isinstance(cursor, Cursor)
+        assert isinstance(db_connection, DbConnection)  # pylint: disable=isinstance-second-argument-not-valid-type
+        assert isinstance(cursor, Cursor)  # pylint: disable=isinstance-second-argument-not-valid-type
         assert m_ansible_module.err_msg == ''
         # The default behaviour, normal in this case:
         assert 'Database name has not been passed' in m_ansible_module.warn_msg
@@ -241,8 +241,8 @@ class TestConnectToDb():
         db_connection = pg.connect_to_db(m_ansible_module, conn_params)
         cursor = db_connection.cursor()
         # if errors, db_connection returned as None:
-        assert isinstance(db_connection, DbConnection)
-        assert isinstance(cursor, Cursor)
+        assert isinstance(db_connection, DbConnection)  # pylint: disable=isinstance-second-argument-not-valid-type
+        assert isinstance(cursor, Cursor)  # pylint: disable=isinstance-second-argument-not-valid-type
         assert m_ansible_module.err_msg == ''
         # The default behaviour, normal in this case:
         assert 'Database name has not been passed' in m_ansible_module.warn_msg
@@ -292,8 +292,8 @@ class TestConnectToDb():
         cursor = db_connection.cursor()
 
         # if errors, db_connection returned as None:
-        assert isinstance(db_connection, DbConnection)
-        assert isinstance(cursor, Cursor)
+        assert isinstance(db_connection, DbConnection)  # pylint: disable=isinstance-second-argument-not-valid-type
+        assert isinstance(cursor, Cursor)  # pylint: disable=isinstance-second-argument-not-valid-type
         assert m_ansible_module.err_msg == ''
 
         # case 2: psycopg2.__version < 2.4.2
@@ -305,8 +305,8 @@ class TestConnectToDb():
         cursor = db_connection.cursor()
 
         # if errors, db_connection returned as None:
-        assert isinstance(db_connection, DbConnection)
-        assert isinstance(cursor, Cursor)
+        assert isinstance(db_connection, DbConnection)  # pylint: disable=isinstance-second-argument-not-valid-type
+        assert isinstance(cursor, Cursor)  # pylint: disable=isinstance-second-argument-not-valid-type
         assert 'psycopg2 must be at least 2.4.3' in m_ansible_module.err_msg
 
 

tests/unit/plugins/modules/monitoring/test_monit.py

@@ -97,7 +97,7 @@ class MonitTest(unittest.TestCase):
                 self.monit.wait_for_monit_to_stop_pending()
 
 
-@pytest.mark.parametrize('status_name', [name for name in monit.StatusValue.ALL_STATUS])
+@pytest.mark.parametrize('status_name', monit.StatusValue.ALL_STATUS)
 def test_status_value(status_name):
     value = getattr(monit.StatusValue, status_name.upper())
     status = monit.StatusValue(value)

tests/unit/plugins/modules/system/interfaces_file/test_interfaces_file.py

@@ -60,7 +60,7 @@ class TestInterfacesFileModule(unittest.TestCase):
                                              tofile=os.path.basename(backup))
         # Restore backup
         move(backup, path)
-        deltas = [d for d in diffs]
+        deltas = list(diffs)
         self.assertTrue(len(deltas) == 0)
 
     def compareInterfacesLinesToFile(self, interfaces_lines, path, testname=None):