Skip to content

Commit e6c772c

Browse files
authored
update tests to work with pytest > 4.0 (#71)
1 parent 7fe58fd commit e6c772c

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
44
This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins/community/blob/master/HOW_WE_CHANGELOG.md)
55

66
# [Unreleased]
7+
### Fixed
8+
9+
- Update tests so that they run with pytest > 4.0. (@borourke)
710

811
# [0.7.1]
12+
### Added
913
- Make get_settings() sensu 2.0 compatible. (@barryorourke)
1014

1115
# [0.7.0]

pylint.rc

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ load-plugins=
4242
# W0221: arguments-differ
4343
# BOR-TODO: look into W0211 more
4444
# BOR-TODO: remove R0205 when we drop python 2.7 support
45-
disable=E1101,R0201,W0212,C0111,R0903,E0602,R0204,W0221,R0205,R0912
45+
disable=E1101,R0201,W0212,C0111,R0903,E0602,R0204,W0221,R0205,R0912,R0801
4646

4747

4848

sensu_plugin/tests/test_check.py

-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@
33
except ImportError:
44
from mock import Mock, patch
55

6-
import pytest
7-
86
from sensu_plugin.check import SensuPluginCheck
97

108

119
class TestSensuPluginCheck(object):
12-
@pytest.fixture(autouse=True)
1310
def __init__(self):
1411
self.sensu_plugin_check = None
1512

sensu_plugin/tests/test_handler.py

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ def mock_api_settings():
3434

3535

3636
class TestSensuHandler(object):
37-
@pytest.fixture(autouse=True)
3837
def __init__(self):
3938
self.sensu_handler = None
4039

sensu_plugin/tests/test_plugin.py

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ def mock_plugin_info():
1818

1919

2020
class TestSensuPlugin(object):
21-
@pytest.fixture(autouse=True)
2221
def __init__(self):
2322
self.sensu_plugin = None
2423

0 commit comments

Comments
 (0)