diff options
author | Hiroshi Miura <miurahr@nttdata.co.jp> | 2015-07-17 16:16:07 +0900 |
---|---|---|
committer | Tim Burke <tim.burke@gmail.com> | 2015-08-18 19:19:22 -0700 |
commit | 38a82e903514c242810e677f12f5eebdb775ef0b (patch) | |
tree | c1b8a77cf51245d83bc7ddbda1176cba4455f5d9 /tests/unit/test_shell.py | |
parent | 3c6565235464fa724929b5abe8f2c32c001996bf (diff) | |
download | python-swiftclient-38a82e903514c242810e677f12f5eebdb775ef0b.tar.gz |
flake8 ignores same hacks as swift
- blacklisted flake8 hacking
- fix against E122 continuation line missing
indentation or outdented
Closes-bug: #1475516
Change-Id: I708d0a3466a1f85c84e478873e142821ce0774cb
Signed-off-by: Hiroshi Miura <miurahr@nttdata.co.jp>
Diffstat (limited to 'tests/unit/test_shell.py')
-rw-r--r-- | tests/unit/test_shell.py | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/tests/unit/test_shell.py b/tests/unit/test_shell.py index 4ac2f5b..46b1f31 100644 --- a/tests/unit/test_shell.py +++ b/tests/unit/test_shell.py @@ -139,10 +139,10 @@ class TestShell(unittest.TestCase): swiftclient.shell.main(argv) self.assertEqual(output.out, - ' Account: AUTH_account\n' - 'Containers: 1\n' - ' Objects: 2\n' - ' Bytes: 3\n') + ' Account: AUTH_account\n' + 'Containers: 1\n' + ' Objects: 2\n' + ' Bytes: 3\n') @mock.patch('swiftclient.service.Connection') def test_stat_container(self, connection): @@ -161,14 +161,14 @@ class TestShell(unittest.TestCase): swiftclient.shell.main(argv) self.assertEqual(output.out, - ' Account: AUTH_account\n' - 'Container: container\n' - ' Objects: 1\n' - ' Bytes: 2\n' - ' Read ACL: test2:tester2\n' - 'Write ACL: test3:tester3\n' - ' Sync To: other\n' - ' Sync Key: secret\n') + ' Account: AUTH_account\n' + 'Container: container\n' + ' Objects: 1\n' + ' Bytes: 2\n' + ' Read ACL: test2:tester2\n' + 'Write ACL: test3:tester3\n' + ' Sync To: other\n' + ' Sync Key: secret\n') @mock.patch('swiftclient.service.Connection') def test_stat_object(self, connection): @@ -187,14 +187,14 @@ class TestShell(unittest.TestCase): swiftclient.shell.main(argv) self.assertEqual(output.out, - ' Account: AUTH_account\n' - ' Container: container\n' - ' Object: object\n' - ' Content Type: text/plain\n' - 'Content Length: 42\n' - ' Last Modified: yesterday\n' - ' ETag: md5\n' - ' Manifest: manifest\n') + ' Account: AUTH_account\n' + ' Container: container\n' + ' Object: object\n' + ' Content Type: text/plain\n' + 'Content Length: 42\n' + ' Last Modified: yesterday\n' + ' ETag: md5\n' + ' Manifest: manifest\n') @mock.patch('swiftclient.service.Connection') def test_list_account(self, connection): @@ -230,8 +230,8 @@ class TestShell(unittest.TestCase): connection.return_value.get_account.assert_has_calls(calls) self.assertEqual(output.out, - ' 0 0 1970-01-01 00:00:01 container\n' - ' 0 0\n') + ' 0 0 1970-01-01 00:00:01 container\n' + ' 0 0\n') # Now test again, this time without returning metadata connection.return_value.head_container.return_value = {} @@ -250,8 +250,8 @@ class TestShell(unittest.TestCase): connection.return_value.get_account.assert_has_calls(calls) self.assertEqual(output.out, - ' 0 0 ????-??-?? ??:??:?? container\n' - ' 0 0\n') + ' 0 0 ????-??-?? ??:??:?? container\n' + ' 0 0\n') def test_list_account_totals_error(self): # No --lh provided: expect info message about incorrect --totals use @@ -312,8 +312,8 @@ class TestShell(unittest.TestCase): connection.return_value.get_container.assert_has_calls(calls) self.assertEqual(output.out, - ' 0 123 456 object_a\n' - ' 0\n') + ' 0 123 456 object_a\n' + ' 0\n') @mock.patch('swiftclient.service.makedirs') @mock.patch('swiftclient.service.Connection') @@ -1626,7 +1626,7 @@ class TestAuth(MockHttpTest): export OS_AUTH_TOKEN=AUTH_tk5b6b12 """ self.assertEqual(textwrap.dedent(expected).lstrip(), - stdout.getvalue()) + stdout.getvalue()) def test_auth_verbose(self): with mock.patch('swiftclient.client.http_connection') as mock_conn: @@ -1647,7 +1647,7 @@ class TestAuth(MockHttpTest): export ST_KEY='te$tin&' """ self.assertEqual(textwrap.dedent(expected).lstrip(), - stdout.getvalue()) + stdout.getvalue()) self.assertEqual([], mock_conn.mock_calls) def test_auth_v2(self): @@ -1670,7 +1670,7 @@ class TestAuth(MockHttpTest): export OS_AUTH_TOKEN=token """ self.assertEqual(textwrap.dedent(expected).lstrip(), - stdout.getvalue()) + stdout.getvalue()) def test_auth_verbose_v2(self): with mock.patch('swiftclient.client.get_auth_keystone') \ @@ -1696,7 +1696,7 @@ class TestAuth(MockHttpTest): export OS_USERNAME=demo """ self.assertEqual(textwrap.dedent(expected).lstrip(), - stdout.getvalue()) + stdout.getvalue()) self.assertEqual([], mock_keystone.mock_calls) |