diff options
author | 2019-05-07 11:02:43 +0200 | |
---|---|---|
committer | 2019-05-23 11:13:58 +0200 | |
commit | b075d9a90269767a4fb83af065d706fb56688130 (patch) | |
tree | 63659ce2b661ae128a0b9f39aefa4ce0dfd4037d /functest/tests/unit/openstack | |
parent | 8358b2d5884b0b2ca9a2de1701e8a3cc90939a63 (diff) |
Update to Python3
Functest containers leverage on Python3 instead of python2.
https://mail.python.org/pipermail/python-dev/2018-March/152348.html
It also updates robotframework librairies to latest release and Vmtp
to master ([1] is needed)
It patches cloudify rest client to support python3.
Vmtp is currently disabled because it currently supports python2 only.
[1] https://github.com/openstack/vmtp/commit/a5d062881d91bf4f547d92c6e289bea30feb5d6e#diff-b4ef698db8ca845e5845c4618278f29a
Change-Id: I39964a212ec2d4dbf53c9ea7c63f02e0b6a05b48
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 2a0702ea914a574ffa7c6d6f83a5c606e24ebd0a)
Diffstat (limited to 'functest/tests/unit/openstack')
-rw-r--r-- | functest/tests/unit/openstack/rally/test_rally.py | 4 | ||||
-rw-r--r-- | functest/tests/unit/openstack/tempest/test_tempest.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/functest/tests/unit/openstack/rally/test_rally.py b/functest/tests/unit/openstack/rally/test_rally.py index 1bdb7c422..fb463c55c 100644 --- a/functest/tests/unit/openstack/rally/test_rally.py +++ b/functest/tests/unit/openstack/rally/test_rally.py @@ -101,12 +101,12 @@ class OSRallyTesting(unittest.TestCase): mock_os_makedirs.assert_called() def test_get_task_id_default(self): - cmd_raw = 'Task 1: started' + cmd_raw = b'Task 1: started' self.assertEqual(self.rally_base.get_task_id(cmd_raw), '1') def test_get_task_id_missing_id(self): - cmd_raw = '' + cmd_raw = b'' self.assertEqual(self.rally_base.get_task_id(cmd_raw), None) diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py index 119959670..a500a37e1 100644 --- a/functest/tests/unit/openstack/tempest/test_tempest.py +++ b/functest/tests/unit/openstack/tempest/test_tempest.py @@ -271,7 +271,7 @@ 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': 'test_deploy_id'} + attrs = {'stdout.readline.return_value': b'test_deploy_id'} mock_stdout.configure_mock(**attrs) mock_popen.return_value = mock_stdout @@ -283,7 +283,7 @@ 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': 'test_deploy_id'} + attrs = {'stdout.readline.return_value': b'test_deploy_id'} mock_stdout.configure_mock(**attrs) mock_popen.return_value = mock_stdout |