diff options
| author | James Falcon <james.falcon@canonical.com> | 2022-01-10 16:56:29 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-10 15:56:29 -0700 |
| commit | dc1aabfca851e520693c05322f724bd102c76364 (patch) | |
| tree | 05c7a0d293b9ddece5671fcdf6a38c59ce776ac8 /conftest.py | |
| parent | 57ccd89b6af7d3551915df56f548b7617dfcebf9 (diff) | |
| download | cloud-init-git-dc1aabfca851e520693c05322f724bd102c76364.tar.gz | |
Remove 3.5 and xenial support (SC-711) (#1167)
Includes:
- Update tox.ini and .travis.yml accordingly
- Cleanup tox.ini with new tox syntax and cloud-init dependencies
- Update documentation accordingly
- Replace/remove xenial references where additional testing isn't required
- Remove xenial checks in integration tests
- Replace yield_fixture with fixture in pytest tests
Sections of code commented with lines like "Remove when Xenial is no
longer supported" still exist as they're require additional testing.
Diffstat (limited to 'conftest.py')
| -rw-r--r-- | conftest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conftest.py b/conftest.py index ffcb3233..3979eb0a 100644 --- a/conftest.py +++ b/conftest.py @@ -65,7 +65,7 @@ class _FixtureUtils: return result[0] -@pytest.yield_fixture(autouse=True) +@pytest.fixture(autouse=True) def disable_subp_usage(request, fixture_utils): """ Across all (pytest) tests, ensure that subp.subp is not invoked. @@ -166,7 +166,7 @@ def fixture_utils(): return _FixtureUtils -@pytest.yield_fixture +@pytest.fixture def httpretty(): """ Enable HTTPretty for duration of the testcase, resetting before and after. |