From 62898e5a00a67de592f2bbde3e96821fd544b285 Mon Sep 17 00:00:00 2001 From: Anatoly Bubenkov Date: Sun, 11 May 2014 16:47:37 +0200 Subject: [PATCH] PR --- pytest_bdd/cucumber_json.py | 4 ++-- tests/feature/test_cucumber_json.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pytest_bdd/cucumber_json.py b/pytest_bdd/cucumber_json.py index 2053b87..401619b 100644 --- a/pytest_bdd/cucumber_json.py +++ b/pytest_bdd/cucumber_json.py @@ -25,13 +25,13 @@ def pytest_configure(config): def pytest_unconfigure(config): xml = getattr(config, '_bddcucumberjson', None) - if xml: + if xml is not None: del config._bddcucumberjson config.pluginmanager.unregister(xml) class LogBDDCucumberJSON(object): - """Log plugin for cucumber like json output.""" + """Logging plugin for cucumber like json output.""" def __init__(self, logfile): logfile = os.path.expanduser(os.path.expandvars(logfile)) diff --git a/tests/feature/test_cucumber_json.py b/tests/feature/test_cucumber_json.py index c9a8c89..cea82c0 100644 --- a/tests/feature/test_cucumber_json.py +++ b/tests/feature/test_cucumber_json.py @@ -1,6 +1,7 @@ """Test cucumber json output.""" import json import textwrap +import os.path import pytest @@ -115,6 +116,6 @@ def test_step_trace(testdir, equals_any): "line": 1, "name": "One passing scenario, one failing scenario", "tags": [], - "uri": testdir.tmpdir.join('test.feature').strpath, + "uri": os.path.join(testdir.tmpdir.basename, 'test.feature'), } ]