Update to Alpine 3.14

It also fixes lots of new pylint warnings.

Change-Id: I3376aee5649596c53bc2941ad4d8e0674a2967fe
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

1 files changed, 6 insertions, 8 deletions

diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py
index 6ff404a13..e27b52ef4 100644
--- a/functest/tests/unit/openstack/tempest/test_tempest.py
+++ b/functest/tests/unit/openstack/tempest/test_tempest.py
@@ -269,10 +269,9 @@ class OSTempestTesting(unittest.TestCase):
 
         with mock.patch('functest.opnfv_tests.openstack.tempest.'
                         'tempest.subprocess.Popen') as mock_popen:
-            mock_stdout = mock.Mock()
-            attrs = {'stdout.readline.return_value': b'test_deploy_id'}
-            mock_stdout.configure_mock(**attrs)
-            mock_popen.return_value = mock_stdout
+            attrs = {'return_value.__enter__.return_value.'
+                     'stdout.readline.return_value': b'test_deploy_id'}
+            mock_popen.configure_mock(**attrs)
 
             self.assertEqual(self.tempestcommon.get_verifier_id(),
                              'test_deploy_id')
@@ -281,10 +280,9 @@ class OSTempestTesting(unittest.TestCase):
         setattr(config.CONF, 'tempest_verifier_name', 'test_deploy_name')
         with mock.patch('functest.opnfv_tests.openstack.tempest.'
                         'tempest.subprocess.Popen') as mock_popen:
-            mock_stdout = mock.Mock()
-            attrs = {'stdout.readline.return_value': b'test_deploy_id'}
-            mock_stdout.configure_mock(**attrs)
-            mock_popen.return_value = mock_stdout
+            attrs = {'return_value.__enter__.return_value.'
+                     'stdout.readline.return_value': b'test_deploy_id'}
+            mock_popen.configure_mock(**attrs)
 
             self.assertEqual(rally.RallyBase.get_verifier_deployment_id(),
                              'test_deploy_id')