diff options
| author | Zuul <zuul@review.opendev.org> | 2022-08-18 01:49:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-08-18 01:49:01 +0000 |
| commit | 7f2649bfb717f0f1cc077c04e206841581d6dab5 (patch) | |
| tree | 5a3af5deb92fdf9ea11f314660dc4bd5ab03107e /test | |
| parent | 9eee29d2e46e774eb08acb76c3317a58856f3f71 (diff) | |
| parent | 5d451fb92031989ea9982fc29140175014448ea2 (diff) | |
| download | python-swiftclient-7f2649bfb717f0f1cc077c04e206841581d6dab5.tar.gz | |
Merge "More cleanup following py2 removal"
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/test_multithreading.py | 3 | ||||
| -rw-r--r-- | test/unit/test_shell.py | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/test/unit/test_multithreading.py b/test/unit/test_multithreading.py index d51bfb7..8237d82 100644 --- a/test/unit/test_multithreading.py +++ b/test/unit/test_multithreading.py @@ -216,12 +216,11 @@ class TestOutputManager(unittest.TestCase): # The threads should have been cleaned up self.assertEqual(starting_thread_count, threading.active_count()) - over_the = "over the '\u062a\u062a'\n" self.assertEqual(''.join([ 'one-argument\n', 'one fish, 88 fish\n', 'some\n', 'where\n', - over_the, + "over the '\u062a\u062a'\n", 'some raw bytes: \u062a\u062a', ' key: value\n', ' object: O\u0308bject\n' diff --git a/test/unit/test_shell.py b/test/unit/test_shell.py index db0d66c..8254388 100644 --- a/test/unit/test_shell.py +++ b/test/unit/test_shell.py @@ -1622,7 +1622,7 @@ class TestShell(unittest.TestCase): with mock.patch('swiftclient.shell.SwiftService.delete') as mock_func: with CaptureOutput() as out: mock_func.return_value = [res] - swiftclient.shell.main(base_argv + [container.encode('utf-8')]) + swiftclient.shell.main(base_argv + [container]) mock_func.assert_called_once_with(container=container) self.assertTrue(out.out.find( @@ -1635,7 +1635,7 @@ class TestShell(unittest.TestCase): with mock.patch('swiftclient.shell.SwiftService.delete') as mock_func: with CaptureOutput() as out: mock_func.return_value = [res] - swiftclient.shell.main(base_argv + [container.encode('utf-8')]) + swiftclient.shell.main(base_argv + [container]) mock_func.assert_called_once_with(container=container) self.assertTrue(out.out.find( |