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 /tests/unittests/test_net_activators.py | |
| parent | 57ccd89b6af7d3551915df56f548b7617dfcebf9 (diff) | |
| download | vyos-cloud-init-dc1aabfca851e520693c05322f724bd102c76364.tar.gz vyos-cloud-init-dc1aabfca851e520693c05322f724bd102c76364.zip | |
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 'tests/unittests/test_net_activators.py')
| -rw-r--r-- | tests/unittests/test_net_activators.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/unittests/test_net_activators.py b/tests/unittests/test_net_activators.py index 0e3ab43f..3c29e2f7 100644 --- a/tests/unittests/test_net_activators.py +++ b/tests/unittests/test_net_activators.py @@ -39,7 +39,7 @@ NETPLAN_CALL_LIST = [ ] -@pytest.yield_fixture +@pytest.fixture def available_mocks(): mocks = namedtuple("Mocks", "m_which, m_file") with patch("cloudinit.subp.which", return_value=True) as m_which: @@ -47,7 +47,7 @@ def available_mocks(): yield mocks(m_which, m_file) -@pytest.yield_fixture +@pytest.fixture def unavailable_mocks(): mocks = namedtuple("Mocks", "m_which, m_file") with patch("cloudinit.subp.which", return_value=False) as m_which: |