import logging
import os
import subprocess
import sys


LOG = logging.getLogger(__name__)


def _prepend_path(env):
    """
    Make sure the PATH contains the location where the Python binary
    lives. This makes sure cli tools installed in a virtualenv work.
    """
    if env is None:
        env = os.environ
    env = dict(env)
    new = os.path.dirname(sys.executable)
    path = env.get('PATH')
    if path is not None:
        new = new + ':' + path
    env['PATH'] = new
    return env


class CLIFailed(Exception):
    """CLI tool failed"""

    def __init__(self, args, status):
        self.args = args
        self.status = status

    def __str__(self):
        return '{doc}: {args}: exited with status {status}'.format(
            doc=self.__doc__,
            args=self.args,
            status=self.status,
            )


class CLIProcess(object):
    def __init__(self, **kw):
        self.kw = kw

    def __enter__(self):
        try:
            self.p = subprocess.Popen(**self.kw)
        except OSError as e:
            raise AssertionError(
                'CLI tool {args!r} does not work: {err}'.format(
                    args=self.kw['args'],
                    err=e,
                    ),
                )
        else:
            return self.p

    def __exit__(self, exc_type, exc_val, exc_tb):
        self.p.wait()
        if self.p.returncode != 0:
            err = CLIFailed(
                args=self.kw['args'],
                status=self.p.returncode,
                )
            if exc_type is None:
                # nothing else raised, so we should complain; if
                # something else failed, we'll just log
                raise err
            else:
                LOG.error(str(err))


class CLITester(object):
    # provide easy way for caller to access the exception class
    # without importing us
    Failed = CLIFailed

    def __init__(self, tmpdir):
        self.tmpdir = tmpdir

    def __call__(self, **kw):
        kw.setdefault('cwd', str(self.tmpdir))
        kw['env'] = _prepend_path(kw.get('env'))
        kw['env']['COLUMNS'] = '80'
        return CLIProcess(**kw)


def pytest_funcarg__cli(request):
    """
    Test command line behavior.
    """

    # the tmpdir here will be the same value as the test function
    # sees; we rely on that to let caller prepare and introspect
    # any files the cli tool will read or create
    tmpdir = request.getfuncargvalue('tmpdir')

    return CLITester(tmpdir=tmpdir)

@@ -47,16 +47,30 @@
 ort sys%0A
+import pytest%0A
 %0A%0ALOG = 
@@ -2168,28 +2168,28 @@
 )%0A%0A%0A
-def 
+@
 pytest
-_funcarg__
+.fixture%0Adef 
 cli(

use new pytest fixture syntax