Skip to content

Commit

Permalink
Remove EOL versions
Browse files Browse the repository at this point in the history
  • Loading branch information
gl-johnson committed Dec 12, 2024
1 parent e163ab8 commit 293087b
Show file tree
Hide file tree
Showing 9 changed files with 6 additions and 52 deletions.
28 changes: 0 additions & 28 deletions .github/workflows/ansible-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,13 @@ jobs:
fail-fast: false
matrix:
ansible:
- stable-2.13
- stable-2.14
- stable-2.15
- stable-2.16
- stable-2.17
- stable-2.18
python:
- '3.9'
- '3.10'
- '3.12'
include:
- ansible: stable-2.13
python: '3.8'
- ansible: stable-2.14
python: '3.11'
- ansible: stable-2.15
python: '3.11'
- ansible: stable-2.16
python: '3.12'
- ansible: stable-2.17
python: '3.12'
- ansible: devel
python: '3.13'

Expand Down Expand Up @@ -99,27 +85,13 @@ jobs:
fail-fast: false
matrix:
ansible:
- stable-2.13
- stable-2.14
- stable-2.15
- stable-2.16
- stable-2.17
- stable-2.18
python:
- '3.9'
- '3.10'
- '3.12'
include:
- ansible: stable-2.13
python: '3.8'
- ansible: stable-2.14
python: '3.11'
- ansible: stable-2.15
python: '3.11'
- ansible: stable-2.16
python: '3.12'
- ansible: stable-2.17
python: '3.12'
- ansible: devel
python: '3.13'

Expand Down
3 changes: 0 additions & 3 deletions tests/sanity/ignore-2.10.txt

This file was deleted.

3 changes: 0 additions & 3 deletions tests/sanity/ignore-2.11.txt

This file was deleted.

3 changes: 0 additions & 3 deletions tests/sanity/ignore-2.12.txt

This file was deleted.

2 changes: 0 additions & 2 deletions tests/sanity/ignore-2.13.txt

This file was deleted.

2 changes: 0 additions & 2 deletions tests/sanity/ignore-2.14.txt

This file was deleted.

2 changes: 0 additions & 2 deletions tests/sanity/ignore-2.15.txt

This file was deleted.

3 changes: 0 additions & 3 deletions tests/sanity/ignore-2.9.txt

This file was deleted.

12 changes: 6 additions & 6 deletions tests/unit/plugins/lookup/test_conjur_variable.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ def test_merge_dictionaries(self):
{},
{'id': 'host/ansible/ansible-fake', 'api_key': 'fakekey'}
)
self.assertEquals(MockMergeDictionaries.RESPONSE, functionOutput)
self.assertEqual(MockMergeDictionaries.RESPONSE, functionOutput)

def test_load_identity_from_file(self):
load_identity = _load_identity_from_file("/etc/conjur.identity", "https://conjur-fake")
self.assertEquals(MockFileload.RESPONSE, load_identity)
self.assertEqual(MockFileload.RESPONSE, load_identity)

def test_load_conf_from_file(self):
load_conf = _load_conf_from_file("/etc/conjur.conf")
self.assertEquals(MockFileload.RESPONSE, load_conf)
self.assertEqual(MockFileload.RESPONSE, load_conf)

@patch('ansible_collections.cyberark.conjur.plugins.lookup.conjur_variable.open_url')
def test_fetch_conjur_token(self, mock_open_url):
Expand All @@ -49,7 +49,7 @@ def test_fetch_conjur_token(self, mock_open_url):
method="POST",
validate_certs=True,
ca_path="cert_file")
self.assertEquals("response body", result)
self.assertEqual("response body", result)

@patch('ansible_collections.cyberark.conjur.plugins.lookup.conjur_variable._repeat_open_url')
def test_fetch_conjur_variable(self, mock_repeat_open_url):
Expand All @@ -63,7 +63,7 @@ def test_fetch_conjur_variable(self, mock_repeat_open_url):
method="GET",
validate_certs=True,
ca_path="cert_file")
self.assertEquals(['response body'], result)
self.assertEqual(['response body'], result)

@patch('ansible_collections.cyberark.conjur.plugins.lookup.conjur_variable._fetch_conjur_variable')
@patch('ansible_collections.cyberark.conjur.plugins.lookup.conjur_variable._fetch_conjur_token')
Expand All @@ -80,7 +80,7 @@ def test_run(self, mock_merge_dictionaries, mock_fetch_conjur_token, mock_fetch_
kwargs = {'as_file': False, 'conf_file': 'conf_file', 'validate_certs': False}
result = self.lookup.run(terms, **kwargs)

self.assertEquals(result, ["conjur_variable"])
self.assertEqual(result, ["conjur_variable"])

@patch('ansible_collections.cyberark.conjur.plugins.lookup.conjur_variable._fetch_conjur_variable')
@patch('ansible_collections.cyberark.conjur.plugins.lookup.conjur_variable._fetch_conjur_token')
Expand Down

0 comments on commit 293087b

Please sign in to comment.