From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Mon, 14 Oct 2013 19:40:09 +0000 (-0400)
Subject: remove another horrible test from cli_osd
X-Git-Tag: v1.3~19^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=afcfafd4944d7a9d9d736caf1fd83ad71dfb2b8b;p=ceph-deploy.git

remove another horrible test from cli_osd

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

diff --git a/ceph_deploy/tests/test_cli_osd.py b/ceph_deploy/tests/test_cli_osd.py
index 25045af..195b6dd 100644
--- a/ceph_deploy/tests/test_cli_osd.py
+++ b/ceph_deploy/tests/test_cli_osd.py
@@ -44,61 +44,3 @@ def test_bad_no_disk(tmpdir, cli):
             result = p.stderr.read()
     assert 'usage: ceph-deploy osd' in result
     assert err.value.status == 2
-
-
-def test_simple(tmpdir, capsys):
-    with tmpdir.join('ceph.conf').open('w') as f:
-        f.write("""\
-[global]
-fsid = 6ede5564-3cf1-44b5-aa96-1c77b0c3e1d0
-mon host = host1
-""")
-
-    ns = argparse.Namespace()
-
-    conn_osd = mock.NonCallableMock(name='PushyClient-osd')
-    mock_compiled_osd = collections.defaultdict(mock.Mock)
-    #conn_osd.compile.side_effect = mock_compiled_osd.__getitem__
-    conn_osd.compile.return_value = mock.Mock(return_value='fakekeyring')
-
-    conn_mon = mock.NonCallableMock(name='PushyClient-mon')
-    mock_compiled_mon = collections.defaultdict(mock.Mock)
-    conn_mon.compile.side_effect = mock_compiled_mon.__getitem__
-
-    ns.pushy = mock.Mock(name='pushy namespace')
-
-    def _conn(url):
-        if url == 'ssh+sudo:host1':
-            return conn_mon
-        elif url == 'ssh+sudo:storehost1:sdc':
-            return conn_osd
-        else:
-            raise AssertionError('Unexpected connection url: %r', url)
-    ns.pushy.side_effect = _conn
-
-    BOOTSTRAP_KEY = 'fakekeyring'
-
-    mock_compiled_mon[osd.get_bootstrap_osd_key].side_effect = BOOTSTRAP_KEY
-
-    def _create_osd(cluster, find_key):
-        key = find_key()
-        assert key == BOOTSTRAP_KEY
-
-    mock_compiled_osd[osd.create_osd].side_effect = _create_osd
-
-    with directory(str(tmpdir)):
-        main(
-            args=['-v', 'gatherkeys', 'storehost1:sdc'],
-            namespace=ns,
-        )
-        main(
-            args=['-v', 'osd', 'prepare', 'storehost1:sdc'],
-            namespace=ns,
-            )
-    out, err = capsys.readouterr()
-    err = err.lower()
-    assert 'have ceph.mon.keyring' in err
-    assert 'have ceph.client.admin.keyring' in err
-    assert 'have ceph.bootstrap-osd.keyring' in err
-    assert 'got ceph.bootstrap-mds.keyring key from storehost1:sdc' in err
-    assert 'got ceph.bootstrap-osd.keyring key from storehost1:sdc' in err