From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 29 Nov 2017 13:17:30 +0000 (-0500)
Subject: [RM-22118] test: use new fixture syntax for cli_new
X-Git-Tag: v2.0.0~4^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7d79a7d921f39a875a3c9c8405965f3e958e2791;p=ceph-deploy.git

[RM-22118] test: use new fixture syntax for cli_new

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph_deploy/tests/test_cli_new.py b/ceph_deploy/tests/test_cli_new.py
index 809709c..2ba221e 100644
--- a/ceph_deploy/tests/test_cli_new.py
+++ b/ceph_deploy/tests/test_cli_new.py
@@ -6,6 +6,7 @@ from mock import patch
 from ceph_deploy import conf
 from ceph_deploy.cli import _main as main
 from ceph_deploy.tests.directory import directory
+import pytest
 
 
 def test_write_global_conf_section(tmpdir):
@@ -22,7 +23,8 @@ def test_write_global_conf_section(tmpdir):
     assert cfg.sections() == ['global']
 
 
-def pytest_funcarg__newcfg(request):
+@pytest.fixture
+def newcfg(request):
     tmpdir = request.getfuncargvalue('tmpdir')
     fake_ip_addresses = lambda x: ['10.0.0.1']