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

[RM-22118] test: use new pytest fixture syntax

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

diff --git a/ceph_deploy/tests/conftest.py b/ceph_deploy/tests/conftest.py
index 819fc34..3b673d1 100644
--- a/ceph_deploy/tests/conftest.py
+++ b/ceph_deploy/tests/conftest.py
@@ -2,6 +2,7 @@ import logging
 import os
 import subprocess
 import sys
+import pytest
 
 
 LOG = logging.getLogger(__name__)
@@ -85,7 +86,8 @@ class CLITester(object):
         return CLIProcess(**kw)
 
 
-def pytest_funcarg__cli(request):
+@pytest.fixture
+def cli(request):
     """
     Test command line behavior.
     """