flake8: fix all tests/library/*.py files

This commit modifies all *.py files in ./tests/library/ so flake8
passes.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit e49a5241f007083e7ec8618115738b3d3d8873cc)
(cherry picked from commit fb98f436848189e26480697b23f45b28f51a6ccd)

diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml
index 9475ec3dc5b4ffc305a5480872cbb2052780692e..ba87e8795ace3141a3c3cc7454dad109ff4ac8ee 100644 (file)
--- a/.github/workflows/flake8.yml
+++ b/.github/workflows/flake8.yml
@@ -3,16 +3,12 @@ on: [pull_request]
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [ '3.6', '3.7', '3.8' ]
-    name: Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v2
       - name: Setup python
         uses: actions/setup-python@v2
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: 3.8
           architecture: x64
       - run: pip install flake8
       - run: flake8 --max-line-length 160 ./library/ ./tests/library/
\ No newline at end of file

diff --git a/tests/library/test_ceph_crush.py b/tests/library/test_ceph_crush.py
index becd7f88b145bb65427934448d928a6b14d2bbc5..d24586c26abfee152727a1768d5256e49d31ae58 100644 (file)
--- a/tests/library/test_ceph_crush.py
+++ b/tests/library/test_ceph_crush.py
@@ -1,8 +1,9 @@
 import sys
-sys.path.append('./library')
-import ceph_crush
 import pytest
 
+sys.path.append('./library')
+import ceph_crush  # noqa: E402
+
 
 class TestCephCrushModule(object):
 
@@ -19,14 +20,14 @@ class TestCephCrushModule(object):
             ("root", "maroute"),
         ]
         with pytest.raises(Exception):
-            result = ceph_crush.sort_osd_crush_location(location, None)
+            ceph_crush.sort_osd_crush_location(location, None)
 
     def test_lower_than_two_bucket(self):
         location = [
             ("chassis", "monchassis"),
         ]
         with pytest.raises(Exception):
-            result = ceph_crush.sort_osd_crush_location(location, None)
+            ceph_crush.sort_osd_crush_location(location, None)
 
     def test_invalid_bucket_type(self):
         location = [
@@ -35,7 +36,7 @@ class TestCephCrushModule(object):
             ("rackyyyyy", "monrack"),
         ]
         with pytest.raises(Exception):
-            result = ceph_crush.sort_osd_crush_location(location, None)
+            ceph_crush.sort_osd_crush_location(location, None)
 
     def test_ordering(self):
         expected_result = [

diff --git a/tests/library/test_ceph_dashboard_user.py b/tests/library/test_ceph_dashboard_user.py
index 304114334996d4635a7f749e7e4a94a05c4c7a0e..50f7704444c054235c8d4b070f784234e7806ff1 100644 (file)
--- a/tests/library/test_ceph_dashboard_user.py
+++ b/tests/library/test_ceph_dashboard_user.py
@@ -1,11 +1,9 @@
-import json
 import os
 import sys
-sys.path.append('./library')
-import ceph_dashboard_user
-from mock.mock import patch, Mock, MagicMock
+from mock.mock import patch, MagicMock
 import pytest
-
+sys.path.append('./library')
+import ceph_dashboard_user  # noqa: E402
 
 fake_binary = 'ceph'
 fake_cluster = 'ceph'
@@ -132,4 +130,4 @@ class TestCephDashboardUserModule(object):
             fake_user
         ]
 
-        assert ceph_dashboard_user.remove_user(fake_module) == expected_cmd
\ No newline at end of file
+        assert ceph_dashboard_user.remove_user(fake_module) == expected_cmd

diff --git a/tests/library/test_ceph_key.py b/tests/library/test_ceph_key.py
index 9ae6e4c38ab2ae4f6669a0e24e84c66ea895474d..c75dbd928dbe4b8132e4fe3fea86a276ddbaaacb 100644 (file)
--- a/tests/library/test_ceph_key.py
+++ b/tests/library/test_ceph_key.py
@@ -1,13 +1,15 @@
 import json
 import os
 import sys
-sys.path.append('./library')
 import ceph_key
 import mock
 import pytest
 from ansible.module_utils import basic
 from ansible.module_utils._text import to_bytes
 
+sys.path.append('./library')
+
+
 # From ceph-ansible documentation
 def set_module_args(args):
     if '_ansible_remote_tmp' not in args:
@@ -18,12 +20,15 @@ def set_module_args(args):
     args = json.dumps({'ANSIBLE_MODULE_ARGS': args})
     basic._ANSIBLE_ARGS = to_bytes(args)
 
+
 class AnsibleExitJson(Exception):
     pass
 
+
 def exit_json(*args, **kwargs):
     raise AnsibleExitJson(kwargs)
 
+
 @mock.patch.dict(os.environ, {'CEPH_CONTAINER_BINARY': 'docker'})
 class TestCephKeyModule(object):
 
@@ -95,22 +100,22 @@ class TestCephKeyModule(object):
         fake_key = "/tmp/my-key"
         fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-octopus"
         expected_command_list = ['docker',
-            'run',
-            '--rm',
-            '--net=host',  # noqa E501
-            '-v', '/etc/ceph:/etc/ceph:z',
-            '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
-            '-v', '/var/log/ceph/:/var/log/ceph/:z',
-            '--entrypoint=ceph',
-            'quay.ceph.io/ceph-ci/daemon:latest-octopus',
-            '-n',
-            "fake-user",
-            '-k',
-            "/tmp/my-key",
-            '--cluster',
-            fake_cluster,
-            'auth',
-            'arg']
+                                 'run',
+                                 '--rm',
+                                 '--net=host',  # noqa E501
+                                 '-v', '/etc/ceph:/etc/ceph:z',
+                                 '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
+                                 '-v', '/var/log/ceph/:/var/log/ceph/:z',
+                                 '--entrypoint=ceph',
+                                 'quay.ceph.io/ceph-ci/daemon:latest-octopus',
+                                 '-n',
+                                 "fake-user",
+                                 '-k',
+                                 "/tmp/my-key",
+                                 '--cluster',
+                                 fake_cluster,
+                                 'auth',
+                                 'arg']
         result = ceph_key.generate_ceph_cmd(
             fake_cluster, fake_args, fake_user, fake_key, fake_container_image)
         assert result == expected_command_list
@@ -197,13 +202,13 @@ class TestCephKeyModule(object):
         fake_keyring_filename = fake_cluster + "." + fake_name + ".keyring"
         fake_file_destination = os.path.join(fake_dest, fake_keyring_filename)
         expected_command_list = [
-            ['ceph-authtool', '--create-keyring', fake_file_destination, '--name', fake_name,  # noqa E501
-                '--add-key', fake_secret, '--cap', 'mon', 'allow *', '--cap', 'osd', 'allow rwx'],  # noqa E501
-            ['ceph', '-n', 'client.admin', '-k', '/etc/ceph/fake.client.admin.keyring', '--cluster', fake_cluster, 'auth',  # noqa E501
+            ['ceph-authtool', '--create-keyring', fake_file_destination, '--name', fake_name,
+                '--add-key', fake_secret, '--cap', 'mon', 'allow *', '--cap', 'osd', 'allow rwx'],
+            ['ceph', '-n', 'client.admin', '-k', '/etc/ceph/fake.client.admin.keyring', '--cluster', fake_cluster, 'auth',
                 'import', '-i', fake_file_destination],
         ]
         result = ceph_key.create_key(fake_module, fake_result, fake_cluster,
-                                     fake_name, fake_secret, fake_caps, fake_import_key, fake_file_destination)  # noqa E501
+                                     fake_name, fake_secret, fake_caps, fake_import_key, fake_file_destination)
         assert result == expected_command_list
 
     def test_create_key_container(self):
@@ -222,37 +227,36 @@ class TestCephKeyModule(object):
         fake_file_destination = os.path.join(fake_dest, fake_keyring_filename)
         fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-octopus"
         expected_command_list = [
-            ['docker',   # noqa E128
-            'run',
-            '--rm',
-            '--net=host',
-            '-v', '/etc/ceph:/etc/ceph:z',
-            '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
-            '-v', '/var/log/ceph/:/var/log/ceph/:z',
-            '--entrypoint=ceph-authtool',
-            'quay.ceph.io/ceph-ci/daemon:latest-octopus',
-            '--create-keyring', fake_file_destination,
-            '--name', fake_name,
-            '--add-key', fake_secret,
-            '--cap', 'mon', 'allow *',
-            '--cap', 'osd', 'allow rwx'],
             ['docker',
-            'run',
-            '--rm',
-            '--net=host',
-            '-v', '/etc/ceph:/etc/ceph:z',
-            '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
-            '-v', '/var/log/ceph/:/var/log/ceph/:z',
-            '--entrypoint=ceph',
-            'quay.ceph.io/ceph-ci/daemon:latest-octopus',
-            '-n', 'client.admin',
-            '-k', '/etc/ceph/fake.client.admin.keyring',
-            '--cluster', fake_cluster,
-            'auth', 'import',
-            '-i', fake_file_destination]
-        ]
-        result = ceph_key.create_key(fake_module, fake_result, fake_cluster, fake_name,  # noqa E501
-                                     fake_secret, fake_caps, fake_import_key, fake_file_destination, fake_container_image)  # noqa E501
+             'run',
+             '--rm',
+             '--net=host',
+             '-v', '/etc/ceph:/etc/ceph:z',
+             '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
+             '-v', '/var/log/ceph/:/var/log/ceph/:z',
+             '--entrypoint=ceph-authtool',
+             'quay.ceph.io/ceph-ci/daemon:latest-octopus',
+             '--create-keyring', fake_file_destination,
+             '--name', fake_name,
+             '--add-key', fake_secret,
+             '--cap', 'mon', 'allow *',
+             '--cap', 'osd', 'allow rwx'],
+            ['docker',
+             'run',
+             '--rm',
+             '--net=host',
+             '-v', '/etc/ceph:/etc/ceph:z',
+             '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
+             '-v', '/var/log/ceph/:/var/log/ceph/:z',
+             '--entrypoint=ceph',
+             'quay.ceph.io/ceph-ci/daemon:latest-octopus',
+             '-n', 'client.admin',
+             '-k', '/etc/ceph/fake.client.admin.keyring',
+             '--cluster', fake_cluster,
+             'auth', 'import',
+             '-i', fake_file_destination]]
+        result = ceph_key.create_key(fake_module, fake_result, fake_cluster, fake_name,
+                                     fake_secret, fake_caps, fake_import_key, fake_file_destination, fake_container_image)
         assert result == expected_command_list
 
     def test_create_key_non_container_no_import(self):
@@ -305,36 +309,36 @@ class TestCephKeyModule(object):
         fake_file_destination = os.path.join(fake_dest, fake_keyring_filename)
         # create_key passes (one for ceph-authtool and one for itself) itw own array so the expected result is an array within an array # noqa E501
         fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-octopus"
-        expected_command_list = [['docker',   # noqa E128
-                                 'run',
-                                 '--rm',
-                                 '--net=host',
-                                 '-v', '/etc/ceph:/etc/ceph:z',
-                                 '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
-                                 '-v', '/var/log/ceph/:/var/log/ceph/:z',
-                                 '--entrypoint=ceph-authtool',
-                                 'quay.ceph.io/ceph-ci/daemon:latest-octopus',
-                                 '--create-keyring',
-                                 fake_file_destination,
-                                 '--name',
-                                 fake_name,
-                                 '--add-key',
-                                 fake_secret,
-                                 '--cap',
-                                 'mon',
-                                 'allow *',
-                                 '--cap',
-                                 'osd',
-                                 'allow rwx']]
-        result = ceph_key.create_key(fake_module, fake_result, fake_cluster, fake_name,  # noqa E501
-                                     fake_secret, fake_caps, fake_import_key, fake_file_destination, fake_container_image)  # noqa E501
+        expected_command_list = [['docker',
+                                  'run',
+                                  '--rm',
+                                  '--net=host',
+                                  '-v', '/etc/ceph:/etc/ceph:z',
+                                  '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
+                                  '-v', '/var/log/ceph/:/var/log/ceph/:z',
+                                  '--entrypoint=ceph-authtool',
+                                  'quay.ceph.io/ceph-ci/daemon:latest-octopus',
+                                  '--create-keyring',
+                                  fake_file_destination,
+                                  '--name',
+                                  fake_name,
+                                  '--add-key',
+                                  fake_secret,
+                                  '--cap',
+                                  'mon',
+                                  'allow *',
+                                  '--cap',
+                                  'osd',
+                                  'allow rwx']]
+        result = ceph_key.create_key(fake_module, fake_result, fake_cluster, fake_name,
+                                     fake_secret, fake_caps, fake_import_key, fake_file_destination, fake_container_image)
         assert result == expected_command_list
 
     def test_delete_key_non_container(self):
         fake_cluster = "fake"
         fake_name = "client.fake"
         expected_command_list = [
-            ['ceph',  '-n', 'client.admin', '-k', '/etc/ceph/fake.client.admin.keyring',  # noqa E501
+            ['ceph',  '-n', 'client.admin', '-k', '/etc/ceph/fake.client.admin.keyring',
                 '--cluster', fake_cluster, 'auth', 'del', fake_name],
         ]
         result = ceph_key.delete_key(fake_cluster, fake_name)
@@ -344,20 +348,19 @@ class TestCephKeyModule(object):
         fake_cluster = "fake"
         fake_name = "client.fake"
         fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-octopus"
-        expected_command_list = [['docker',   # noqa E128
-                                 'run',
-                                 '--rm',
-                                 '--net=host',
-                                 '-v', '/etc/ceph:/etc/ceph:z',
-                                 '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
-                                 '-v', '/var/log/ceph/:/var/log/ceph/:z',
-                                 '--entrypoint=ceph',
-                                 'quay.ceph.io/ceph-ci/daemon:latest-octopus',
-                                 '-n', 'client.admin',
-                                 '-k', '/etc/ceph/fake.client.admin.keyring',
-                                 '--cluster', fake_cluster,
-                                 'auth', 'del', fake_name]
-        ]
+        expected_command_list = [['docker',
+                                  'run',
+                                  '--rm',
+                                  '--net=host',
+                                  '-v', '/etc/ceph:/etc/ceph:z',
+                                  '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
+                                  '-v', '/var/log/ceph/:/var/log/ceph/:z',
+                                  '--entrypoint=ceph',
+                                  'quay.ceph.io/ceph-ci/daemon:latest-octopus',
+                                  '-n', 'client.admin',
+                                  '-k', '/etc/ceph/fake.client.admin.keyring',
+                                  '--cluster', fake_cluster,
+                                  'auth', 'del', fake_name]]
         result = ceph_key.delete_key(
             fake_cluster, fake_name, fake_container_image)
         assert result == expected_command_list
@@ -369,7 +372,7 @@ class TestCephKeyModule(object):
         fake_key = "/tmp/my-key"
         fake_output_format = "json"
         expected_command_list = [
-            ['ceph', '-n', "fake-user", '-k', "/tmp/my-key", '--cluster', fake_cluster, 'auth',  # noqa E501
+            ['ceph', '-n', "fake-user", '-k', "/tmp/my-key", '--cluster', fake_cluster, 'auth',
                 'get', fake_name, '-f', 'json'],
         ]
         result = ceph_key.info_key(
@@ -383,23 +386,22 @@ class TestCephKeyModule(object):
         fake_key = "/tmp/my-key"
         fake_output_format = "json"
         fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-octopus"
-        expected_command_list = [['docker',   # noqa E128
-                                 'run',
-                                 '--rm',
-                                 '--net=host',
-                                 '-v', '/etc/ceph:/etc/ceph:z',
-                                 '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
-                                 '-v', '/var/log/ceph/:/var/log/ceph/:z',
-                                 '--entrypoint=ceph',
-                                 'quay.ceph.io/ceph-ci/daemon:latest-octopus',
-                                 '-n', "fake-user",
-                                 '-k', "/tmp/my-key",
-                                 '--cluster', fake_cluster,
-                                 'auth', 'get', fake_name,
-                                 '-f', 'json']
-        ]
+        expected_command_list = [['docker',
+                                  'run',
+                                  '--rm',
+                                  '--net=host',
+                                  '-v', '/etc/ceph:/etc/ceph:z',
+                                  '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
+                                  '-v', '/var/log/ceph/:/var/log/ceph/:z',
+                                  '--entrypoint=ceph',
+                                  'quay.ceph.io/ceph-ci/daemon:latest-octopus',
+                                  '-n', "fake-user",
+                                  '-k', "/tmp/my-key",
+                                  '--cluster', fake_cluster,
+                                  'auth', 'get', fake_name,
+                                  '-f', 'json']]
         result = ceph_key.info_key(
-            fake_cluster, fake_name, fake_user, fake_key, fake_output_format, fake_container_image)  # noqa E501
+            fake_cluster, fake_name, fake_user, fake_key, fake_output_format, fake_container_image)
         assert result == expected_command_list
 
     def test_list_key_non_container(self):
@@ -420,23 +422,22 @@ class TestCephKeyModule(object):
         fake_dest = "/fake/ceph"
         fake_keyring_filename = fake_cluster + "." + fake_name + ".keyring"
         fake_file_destination = os.path.join(fake_dest, fake_keyring_filename)
-        expected_command_list = [['docker',   # noqa E128
-                                 'run',
-                                 '--rm',
-                                 '--net=host',
-                                 '-v', '/etc/ceph:/etc/ceph:z',
-                                 '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
-                                 '-v', '/var/log/ceph/:/var/log/ceph/:z',
-                                 '--entrypoint=ceph',
-                                 'quay.ceph.io/ceph-ci/daemon:latest-octopus',
-                                 '-n', "client.admin",
-                                 '-k', "/etc/ceph/fake.client.admin.keyring",  # noqa E501
-                                 '--cluster', fake_cluster,
-                                 'auth', 'get',
-                                 fake_name, '-o', fake_file_destination],
-        ]
+        expected_command_list = [['docker',
+                                  'run',
+                                  '--rm',
+                                  '--net=host',
+                                  '-v', '/etc/ceph:/etc/ceph:z',
+                                  '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
+                                  '-v', '/var/log/ceph/:/var/log/ceph/:z',
+                                  '--entrypoint=ceph',
+                                  'quay.ceph.io/ceph-ci/daemon:latest-octopus',
+                                  '-n', "client.admin",
+                                  '-k', "/etc/ceph/fake.client.admin.keyring",
+                                  '--cluster', fake_cluster,
+                                  'auth', 'get',
+                                  fake_name, '-o', fake_file_destination], ]
         result = ceph_key.get_key(
-            fake_cluster, fake_name, fake_file_destination, fake_container_image)  # noqa E501
+            fake_cluster, fake_name, fake_file_destination, fake_container_image)
         assert result == expected_command_list
 
     def test_get_key_non_container(self):
@@ -446,11 +447,11 @@ class TestCephKeyModule(object):
         fake_keyring_filename = fake_cluster + "." + fake_name + ".keyring"
         fake_file_destination = os.path.join(fake_dest, fake_keyring_filename)
         expected_command_list = [
-            ['ceph', '-n', "client.admin", '-k', "/etc/ceph/fake.client.admin.keyring",  # noqa E501
-                '--cluster', fake_cluster, 'auth', 'get', fake_name, '-o', fake_file_destination],  # noqa E501
+            ['ceph', '-n', "client.admin", '-k', "/etc/ceph/fake.client.admin.keyring",
+                '--cluster', fake_cluster, 'auth', 'get', fake_name, '-o', fake_file_destination],
         ]
         result = ceph_key.get_key(
-            fake_cluster, fake_name, fake_file_destination)  # noqa E501
+            fake_cluster, fake_name, fake_file_destination)
         assert result == expected_command_list
 
     def test_list_key_non_container_with_mon_key(self):
@@ -458,9 +459,9 @@ class TestCephKeyModule(object):
         fake_cluster = "fake"
         fake_user = "mon."
         fake_keyring_dirname = fake_cluster + "-" + fake_hostname
-        fake_key = os.path.join("/var/lib/ceph/mon/", fake_keyring_dirname, 'keyring') # noqa E501
+        fake_key = os.path.join("/var/lib/ceph/mon/", fake_keyring_dirname, 'keyring')
         expected_command_list = [
-            ['ceph', '-n', "mon.", '-k', "/var/lib/ceph/mon/fake-mon01/keyring",  # noqa E501
+            ['ceph', '-n', "mon.", '-k', "/var/lib/ceph/mon/fake-mon01/keyring",
                 '--cluster', fake_cluster, 'auth', 'ls', '-f', 'json'],
         ]
         result = ceph_key.list_keys(fake_cluster, fake_user, fake_key)
@@ -471,24 +472,23 @@ class TestCephKeyModule(object):
         fake_cluster = "fake"
         fake_user = "mon."
         fake_keyring_dirname = fake_cluster + "-" + fake_hostname
-        fake_key = os.path.join("/var/lib/ceph/mon/", fake_keyring_dirname, 'keyring') # noqa E501
+        fake_key = os.path.join("/var/lib/ceph/mon/", fake_keyring_dirname, 'keyring')
         fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-octopus"
-        expected_command_list = [['docker',   # noqa E128
-                                 'run',
-                                 '--rm',
-                                 '--net=host',
-                                 '-v', '/etc/ceph:/etc/ceph:z',
-                                 '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
-                                 '-v', '/var/log/ceph/:/var/log/ceph/:z',
-                                 '--entrypoint=ceph',
-                                 'quay.ceph.io/ceph-ci/daemon:latest-octopus',
-                                 '-n', "mon.",
-                                 '-k', "/var/lib/ceph/mon/fake-mon01/keyring",  # noqa E501
-                                 '--cluster', fake_cluster,
-                                 'auth', 'ls',
-                                 '-f', 'json'],
-        ]
-        result = ceph_key.list_keys(fake_cluster, fake_user, fake_key, fake_container_image)  # noqa E501
+        expected_command_list = [['docker',
+                                  'run',
+                                  '--rm',
+                                  '--net=host',
+                                  '-v', '/etc/ceph:/etc/ceph:z',
+                                  '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
+                                  '-v', '/var/log/ceph/:/var/log/ceph/:z',
+                                  '--entrypoint=ceph',
+                                  'quay.ceph.io/ceph-ci/daemon:latest-octopus',
+                                  '-n', "mon.",
+                                  '-k', "/var/lib/ceph/mon/fake-mon01/keyring",
+                                  '--cluster', fake_cluster,
+                                  'auth', 'ls',
+                                  '-f', 'json'], ]
+        result = ceph_key.list_keys(fake_cluster, fake_user, fake_key, fake_container_image)
         assert result == expected_command_list
 
     def test_list_key_container(self):
@@ -496,21 +496,20 @@ class TestCephKeyModule(object):
         fake_user = "fake-user"
         fake_key = "/tmp/my-key"
         fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-octopus"
-        expected_command_list = [['docker',   # noqa E128
-                                 'run',
-                                 '--rm',
-                                 '--net=host',
-                                 '-v', '/etc/ceph:/etc/ceph:z',
-                                 '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
-                                 '-v', '/var/log/ceph/:/var/log/ceph/:z',
-                                 '--entrypoint=ceph',
-                                 'quay.ceph.io/ceph-ci/daemon:latest-octopus',
-                                 '-n', "fake-user",
-                                 '-k', "/tmp/my-key",
-                                 '--cluster', fake_cluster,
-                                 'auth', 'ls',
-                                 '-f', 'json'],
-        ]
+        expected_command_list = [['docker',
+                                  'run',
+                                  '--rm',
+                                  '--net=host',
+                                  '-v', '/etc/ceph:/etc/ceph:z',
+                                  '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
+                                  '-v', '/var/log/ceph/:/var/log/ceph/:z',
+                                  '--entrypoint=ceph',
+                                  'quay.ceph.io/ceph-ci/daemon:latest-octopus',
+                                  '-n', "fake-user",
+                                  '-k', "/tmp/my-key",
+                                  '--cluster', fake_cluster,
+                                  'auth', 'ls',
+                                  '-f', 'json'], ]
         result = ceph_key.list_keys(
             fake_cluster, fake_user, fake_key, fake_container_image)
         assert result == expected_command_list
@@ -543,16 +542,19 @@ class TestCephKeyModule(object):
     def test_state_info(self, m_exec_commands, m_exit_json):
         set_module_args({"state": "info",
                          "cluster": "ceph",
-                         "name": "client.admin"
-        })
+                         "name": "client.admin"}
+                        )
         m_exit_json.side_effect = exit_json
-        m_exec_commands.return_value = (0, ['ceph', 'auth', 'get', 'client.admin', '-f', 'json'] ,'[{"entity":"client.admin","key":"AQC1tw5fF156GhAAoJCvHGX/jl/k7/N4VZm8iQ==","caps":{"mds":"allow *","mgr":"allow *","mon":"allow *","osd":"allow *"}}]', 'exported keyring for client.admin')
+        m_exec_commands.return_value = (0,
+                                        ['ceph', 'auth', 'get', 'client.admin', '-f', 'json'],
+                                        '[{"entity":"client.admin","key":"AQC1tw5fF156GhAAoJCvHGX/jl/k7/N4VZm8iQ==","caps":{"mds":"allow *","mgr":"allow *","mon":"allow *","osd":"allow *"}}]',  # noqa: E501
+                                        'exported keyring for client.admin')
 
         with pytest.raises(AnsibleExitJson) as result:
             ceph_key.run_module()
 
         result = result.value.args[0]
-        assert result['changed'] == False
-        assert result['stdout'] == '[{"entity":"client.admin","key":"AQC1tw5fF156GhAAoJCvHGX/jl/k7/N4VZm8iQ==","caps":{"mds":"allow *","mgr":"allow *","mon":"allow *","osd":"allow *"}}]'
+        assert not result['changed']
+        assert result['stdout'] == '[{"entity":"client.admin","key":"AQC1tw5fF156GhAAoJCvHGX/jl/k7/N4VZm8iQ==","caps":{"mds":"allow *","mgr":"allow *","mon":"allow *","osd":"allow *"}}]'  # noqa: E501
         assert result['stderr'] == 'exported keyring for client.admin'
-        assert result['rc'] == 0
\ No newline at end of file
+        assert result['rc'] == 0

diff --git a/tests/library/test_ceph_volume.py b/tests/library/test_ceph_volume.py
index 9d92e98f82489e1ad360ec0c886f24589f82013e..d714ffc68ed013d09e29c657d4328adea9db2496 100644 (file)
--- a/tests/library/test_ceph_volume.py
+++ b/tests/library/test_ceph_volume.py
@@ -1,9 +1,9 @@
 import sys
-sys.path.append('./library')
-import ceph_volume
 import mock
 import os
 import pytest
+sys.path.append('./library')
+import ceph_volume  # noqa: E402
 
 
 # Python 3
@@ -174,7 +174,7 @@ class TestCephVolumeModule(object):
         result = ceph_volume.list_storage_inventory(fake_module, fake_container_image)
         assert result == expected_command_list
 
-    @pytest.mark.parametrize('objectstore', ['bluestore','filestore'])
+    @pytest.mark.parametrize('objectstore', ['bluestore', 'filestore'])
     def test_create_osd_container(self, objectstore):
         fake_module = MagicMock()
         fake_module.params = {'data': '/dev/sda',
@@ -195,7 +195,7 @@ class TestCephVolumeModule(object):
             fake_module, fake_action, fake_container_image)
         assert result == expected_command_list
 
-    @pytest.mark.parametrize('objectstore', ['bluestore','filestore'])
+    @pytest.mark.parametrize('objectstore', ['bluestore', 'filestore'])
     def test_create_osd(self, objectstore):
         fake_module = MagicMock()
         fake_module.params = {'data': '/dev/sda',
@@ -216,7 +216,7 @@ class TestCephVolumeModule(object):
             fake_module, fake_action, fake_container_image)
         assert result == expected_command_list
 
-    @pytest.mark.parametrize('objectstore', ['bluestore','filestore'])
+    @pytest.mark.parametrize('objectstore', ['bluestore', 'filestore'])
     def test_prepare_osd_container(self, objectstore):
         fake_module = MagicMock()
         fake_module.params = {'data': '/dev/sda',
@@ -237,7 +237,7 @@ class TestCephVolumeModule(object):
             fake_module, fake_action, fake_container_image)
         assert result == expected_command_list
 
-    @pytest.mark.parametrize('objectstore', ['bluestore','filestore'])
+    @pytest.mark.parametrize('objectstore', ['bluestore', 'filestore'])
     def test_prepare_osd(self, objectstore):
         fake_module = MagicMock()
         fake_module.params = {'data': '/dev/sda',
@@ -258,7 +258,7 @@ class TestCephVolumeModule(object):
             fake_module, fake_action, fake_container_image)
         assert result == expected_command_list
 
-    @pytest.mark.parametrize('objectstore', ['bluestore','filestore'])
+    @pytest.mark.parametrize('objectstore', ['bluestore', 'filestore'])
     def test_batch_osd_container(self, objectstore):
         fake_module = MagicMock()
         fake_module.params = {'data': '/dev/sda',
@@ -285,7 +285,7 @@ class TestCephVolumeModule(object):
             fake_module, fake_container_image)
         assert result == expected_command_list
 
-    @pytest.mark.parametrize('objectstore', ['bluestore','filestore'])
+    @pytest.mark.parametrize('objectstore', ['bluestore', 'filestore'])
     def test_batch_osd(self, objectstore):
         fake_module = MagicMock()
         fake_module.params = {'data': '/dev/sda',