]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-deploy.git/commitdiff
[RM-22118] test: use new pytest fixture syntax
authorAlfredo Deza <adeza@redhat.com>
Wed, 29 Nov 2017 13:17:12 +0000 (08:17 -0500)
committerAlfredo Deza <adeza@redhat.com>
Wed, 29 Nov 2017 13:52:32 +0000 (08:52 -0500)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
ceph_deploy/tests/conftest.py

index 819fc34d561b8aa7df3f965a20e8182ba997f65d..3b673d1bda86daf7084bdbb1e0f53899daa5bb80 100644 (file)
@@ -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.
     """