fix unused imports in tests

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>

diff --git a/ceph_deploy/tests/test_cli.py b/ceph_deploy/tests/test_cli.py
index 9829ee5104c1010b41aa9340d3ae2dca4c487a63..f20b7cf0c2ed58ea82935d71d35e950fbd66d4a4 100644 (file)
--- a/ceph_deploy/tests/test_cli.py
+++ b/ceph_deploy/tests/test_cli.py
@@ -22,7 +22,7 @@ def test_bad_command(tmpdir, cli):
             result = p.stderr.read()
     assert 'usage: ceph-deploy' in result
     assert err.value.status == 2
-    assert [p.basename for p in tmpdir.listdir()] == []
+    assert [f.basename for f in tmpdir.listdir()] == []
 
 
 def test_bad_cluster(tmpdir, cli):
@@ -34,4 +34,4 @@ def test_bad_cluster(tmpdir, cli):
             result = p.stderr.read()
     assert 'usage: ceph-deploy' in result
     assert err.value.status == 2
-    assert [p.basename for p in tmpdir.listdir()] == []
+    assert [f.basename for f in tmpdir.listdir()] == []

diff --git a/ceph_deploy/tests/test_cli_install.py b/ceph_deploy/tests/test_cli_install.py
index 36129b2b085623c36050a0252b1f1743b079603d..f17197352dfcf39089708df8008812140f0d6e9d 100644 (file)
--- a/ceph_deploy/tests/test_cli_install.py
+++ b/ceph_deploy/tests/test_cli_install.py
@@ -1,14 +1,6 @@
-import argparse
-import collections
-import mock
 import pytest
 import subprocess
 
-from ..cli import main
-from .. import install
-
-from .directory import directory
-
 
 def test_help(tmpdir, cli):
     with cli(

diff --git a/ceph_deploy/tests/test_cli_mon.py b/ceph_deploy/tests/test_cli_mon.py
index 2b95db3086e43ef7186f0f93a8aa33f30e31021c..7d0e4a9427ac84835178586a3f6b64d0cebe43fb 100644 (file)
--- a/ceph_deploy/tests/test_cli_mon.py
+++ b/ceph_deploy/tests/test_cli_mon.py
@@ -5,10 +5,8 @@ import pytest
 import subprocess
 
 from ..cli import main
-from .. import mon
-
 from .directory import directory
-from .fakes import fake_getaddrinfo
+
 
 def test_help(tmpdir, cli):
     with cli(

diff --git a/ceph_deploy/tests/test_cli_new.py b/ceph_deploy/tests/test_cli_new.py
index 4c7a10d97fb90ff7c5849f7678a2c7bb34eb4c42..58922e1af2cb8ee52086de5c42d41b8124643e80 100644 (file)
--- a/ceph_deploy/tests/test_cli_new.py
+++ b/ceph_deploy/tests/test_cli_new.py
@@ -6,7 +6,6 @@ import uuid
 from .. import conf
 from ..cli import main
 from .directory import directory
-from .fakes import fake_getaddrinfo
 
 
 def test_help(tmpdir, cli):
@@ -32,13 +31,12 @@ def test_write_global_conf_section(tmpdir, cli):
 
 def pytest_funcarg__newcfg(request):
     tmpdir = request.getfuncargvalue('tmpdir')
-    cli = request.getfuncargvalue('cli')
 
     def new(*args):
         with patch('ceph_deploy.new.net.get_nonlocal_ip', lambda x: '10.0.0.1'):
             with patch('ceph_deploy.new.arg_validators.Hostname', lambda: lambda x: x):
                 with directory(str(tmpdir)):
-                    main( args=['new'] + list(args))
+                    main(args=['new'] + list(args))
                     with tmpdir.join('ceph.conf').open() as f:
                         cfg = conf.ceph.parse(f)
                     return cfg

diff --git a/ceph_deploy/tests/test_cli_osd.py b/ceph_deploy/tests/test_cli_osd.py
index 195b6dd1c1e58f57c042c976357cccc859818dc6..39e348ba43b3ac92b643974076957bf29d684f79 100644 (file)
--- a/ceph_deploy/tests/test_cli_osd.py
+++ b/ceph_deploy/tests/test_cli_osd.py
@@ -1,14 +1,6 @@
-import argparse
-import collections
-import mock
 import pytest
 import subprocess
 
-from ..cli import main
-from .. import osd
-
-from .directory import directory
-
 
 def test_help(tmpdir, cli):
     with cli(

diff --git a/ceph_deploy/tests/unit/test_mon.py b/ceph_deploy/tests/unit/test_mon.py
index 0bfa442e84b00899359736d41159c48800f12525..5ba4136a9be9ffd2e189027424e5dbe8f62d7a48 100644 (file)
--- a/ceph_deploy/tests/unit/test_mon.py
+++ b/ceph_deploy/tests/unit/test_mon.py
@@ -1,6 +1,6 @@
 import sys
 import py.test
-from mock import Mock, MagicMock, patch, call
+from mock import Mock, patch, call
 from ceph_deploy import mon
 from ceph_deploy.tests import fakes
 from ceph_deploy.hosts.common import mon_create