Skip to content

Commit eeb5aab

Browse files
ademariagademariag
authored
Merge pull request #15 from kapicorp/improve-tests
Fix tests and add github tests
2 parents 856b34c + fde6f24 commit eeb5aab

10 files changed

+109
-33
lines changed

‎.github/dependabot.yml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "pip" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"
12+
commit-message:
13+
prefix: "chore: "
14+
labels:
15+
- "dependencies"
16+
open-pull-requests-limit: 2
17+
reviewers:
18+
- "kapicorp/kapicorpdevs"
19+
# Maintain dependencies for GitHub Actions
20+
- package-ecosystem: "github-actions"
21+
directory: "/"
22+
schedule:
23+
interval: "daily"
24+
labels:
25+
- "github-actions"

‎.github/workflows/test-build-publish.yml

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
---
2+
name: Test Reclass
3+
run-name: PyTest tests for ${{ github.actor }} on branch ${{ github.ref_name }}
4+
5+
concurrency:
6+
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
7+
cancel-in-progress: true
8+
9+
on:
10+
push:
11+
branches:
12+
- master
13+
- main
14+
15+
release:
16+
types: [created]
17+
18+
pull_request:
19+
20+
jobs:
21+
test:
22+
name: python ${{ matrix.python-version }} tests
23+
runs-on: ubuntu-latest
24+
if: success() || failure() # Continue running if other jobs fail
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
python-version: ['3.10', '3.11', '3.12']
29+
steps:
30+
- name: Checkout kapitan recursively
31+
uses: actions/checkout@v4
32+
with:
33+
submodules: recursive
34+
- name: Set up Python ${{ matrix.python-version }}
35+
uses: actions/setup-python@v5
36+
with:
37+
cache: 'pip'
38+
python-version: ${{ matrix.python-version }}
39+
- name: Install libraries dependencies
40+
run: |
41+
pip install -r requirements.txt
42+
pip install pytest pytest-md pytest-emoji mock
43+
- name: Run pytest
44+
uses: pavelzw/pytest-action@v2
45+
with:
46+
verbose: true
47+
emoji: false
48+
job-summary: true
49+
custom-arguments: '-q'
50+
click-to-expand: true
51+
report-title: 'Reclass Tests'

‎reclass/tests/test_core.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def _core(self, dataset, opts={}, class_mappings=[]):
3434
def test_type_conversion(self):
3535
reclass = self._core('01')
3636
node = reclass.nodeinfo('data_types')
37-
params = { 'int': 1, 'bool': True, 'string': '1', '_reclass_': { 'environment': 'base', 'name': {'full': 'data_types', 'short': 'data_types' } } }
37+
params = { 'int': 1, 'bool': True, 'string': '1', '_reclass_': { 'environment': 'base', 'name': {'full': 'data_types', 'parts': ['data_types'], 'path': 'data_types', 'short': 'data_types' } } }
3838
self.assertEqual(node['parameters'], params)
3939

4040
def test_raise_class_notfound(self):
@@ -45,7 +45,7 @@ def test_raise_class_notfound(self):
4545
def test_ignore_class_notfound(self):
4646
reclass = self._core('01', opts={ 'ignore_class_notfound': True, 'ignore_class_notfound_warning': False })
4747
node = reclass.nodeinfo('class_notfound')
48-
params = { 'node_test': 'class not found', '_reclass_': { 'environment': 'base', 'name': {'full': 'class_notfound', 'short': 'class_notfound' } } }
48+
params = { 'node_test': 'class not found', '_reclass_': { 'environment': 'base', 'name': {'full': 'class_notfound', 'parts': ['class_notfound'], 'path': 'class_notfound', 'short': 'class_notfound' } } }
4949
self.assertEqual(node['parameters'], params)
5050

5151
def test_raise_class_notfound_with_regexp(self):
@@ -56,31 +56,31 @@ def test_raise_class_notfound_with_regexp(self):
5656
def test_ignore_class_notfound_with_regexp(self):
5757
reclass = self._core('01', opts={ 'ignore_class_notfound': True, 'ignore_class_notfound_warning': False, 'ignore_class_notfound_regexp': 'miss.*' })
5858
node = reclass.nodeinfo('class_notfound')
59-
params = { 'node_test': 'class not found', '_reclass_': { 'environment': 'base', 'name': {'full': 'class_notfound', 'short': 'class_notfound' } } }
59+
params = { 'node_test': 'class not found', '_reclass_': { 'environment': 'base', 'name': {'full': 'class_notfound', 'parts': ['class_notfound'], 'path': 'class_notfound', 'short': 'class_notfound' } } }
6060
self.assertEqual(node['parameters'], params)
6161

6262
def test_relative_class_names(self):
6363
reclass = self._core('02')
6464
node = reclass.nodeinfo('relative')
65-
params = { 'test1': 1, 'test2': 2, 'test3': 3, 'test4': 4, 'test5': 5, 'one_beta': 1, 'two_beta': 2, 'four_alpha': 3, 'two_gamma': 4, 'alpha_init': 5, '_reclass_': { 'environment': 'base', 'name': { 'full': 'relative', 'short': 'relative' } } }
65+
params = { 'test1': 1, 'test2': 2, 'test3': 3, 'test4': 4, 'test5': 5, 'one_beta': 1, 'two_beta': 2, 'four_alpha': 3, 'two_gamma': 4, 'alpha_init': 5, '_reclass_': { 'environment': 'base', 'name': { 'full': 'relative', 'parts': ['relative'], 'path': 'relative', 'short': 'relative' } } }
6666
self.assertEqual(node['parameters'], params)
6767

6868
def test_top_relative_class_names(self):
6969
reclass = self._core('02')
7070
node = reclass.nodeinfo('top_relative')
71-
params = { 'test1': 1, 'test2': 2, 'test3': 3, 'test4': 4, 'test5': 5, 'one_beta': 1, 'two_beta': 2, 'four_alpha': 3, 'two_gamma': 4, 'alpha_init': 5, '_reclass_': { 'environment': 'base', 'name': { 'full': 'top_relative', 'short': 'top_relative' } } }
71+
params = { 'test1': 1, 'test2': 2, 'test3': 3, 'test4': 4, 'test5': 5, 'one_beta': 1, 'two_beta': 2, 'four_alpha': 3, 'two_gamma': 4, 'alpha_init': 5, '_reclass_': { 'environment': 'base', 'name': { 'full': 'top_relative', 'parts': ['top_relative'], 'path': 'top_relative', 'short': 'top_relative' } } }
7272
self.assertEqual(node['parameters'], params)
7373

7474
def test_compose_node_names(self):
7575
reclass = self._core('03', opts={'compose_node_name': True})
7676
alpha_one_node = reclass.nodeinfo('alpha.one')
77-
alpha_one_res = {'a': 1, 'alpha': [1, 2], 'beta': {'a': 1, 'b': 2}, 'b': 2, '_reclass_': {'environment': 'base', 'name': {'full': 'alpha.one', 'short': 'alpha'}}}
77+
alpha_one_res = {'a': 1, 'alpha': [1, 2], 'beta': {'a': 1, 'b': 2}, 'b': 2, '_reclass_': {'environment': 'base', 'name': {'full': 'alpha.one', 'parts': ['alpha', 'one'], 'path': 'alpha/one', 'short': 'one'}}}
7878
alpha_two_node = reclass.nodeinfo('alpha.two')
79-
alpha_two_res = {'a': 1, 'alpha': [1, 3], 'beta': {'a': 1, 'c': 3}, 'c': 3, '_reclass_': {'environment': 'base', 'name': {'full': 'alpha.two', 'short': 'alpha'}}}
79+
alpha_two_res = {'a': 1, 'alpha': [1, 3], 'beta': {'a': 1, 'c': 3}, 'c': 3, '_reclass_': {'environment': 'base', 'name': {'full': 'alpha.two', 'parts': ['alpha', 'two'], 'path': 'alpha/two', 'short': 'two'}}}
8080
beta_one_node = reclass.nodeinfo('beta.one')
81-
beta_one_res = {'alpha': [2, 3], 'beta': {'c': 3, 'b': 2}, 'b': 2, 'c': 3, '_reclass_': {'environment': 'base', 'name': {'full': 'beta.one', 'short': 'beta'}}}
81+
beta_one_res = {'alpha': [2, 3], 'beta': {'c': 3, 'b': 2}, 'b': 2, 'c': 3, '_reclass_': {'environment': 'base', 'name': {'full': 'beta.one', 'parts': ['beta', 'one'], 'path': 'beta/one', 'short': 'one'}}}
8282
beta_two_node = reclass.nodeinfo('beta.two')
83-
beta_two_res = {'alpha': [3, 4], 'c': 3, 'beta': {'c': 3, 'd': 4}, 'd': 4, '_reclass_': {'environment': u'base', 'name': {'full': u'beta.two', 'short': u'beta'}}}
83+
beta_two_res = {'alpha': [3, 4], 'c': 3, 'beta': {'c': 3, 'd': 4}, 'd': 4, '_reclass_': {'environment': u'base', 'name': {'full': u'beta.two', 'parts': ['beta', 'two'], 'path': 'beta/two', 'short': u'two'}}}
8484
self.assertEqual(alpha_one_node['parameters'], alpha_one_res)
8585
self.assertEqual(alpha_two_node['parameters'], alpha_two_res)
8686
self.assertEqual(beta_one_node['parameters'], beta_one_res)
@@ -89,13 +89,13 @@ def test_compose_node_names(self):
8989
def test_class_mappings_match_path_false(self):
9090
reclass = self._core('04', opts={'class_mappings_match_path': False}, class_mappings=['node* two', 'alpha/node* three'])
9191
node = reclass.nodeinfo('node1')
92-
params = { 'test1': 1, 'test2': 2, '_reclass_': {'environment': u'base', 'name': {'full': 'node1', 'short': 'node1'}}}
92+
params = { 'test1': 1, 'test2': 2, '_reclass_': {'environment': u'base', 'name': {'full': 'node1', 'parts': ['node1'], 'path': 'node1', 'short': 'node1'}}}
9393
self.assertEqual(node['parameters'], params)
9494

9595
def test_class_mappings_match_path_true(self):
9696
reclass = self._core('04', opts={'class_mappings_match_path': True}, class_mappings=['node* two', 'alpha/node* three'])
9797
node = reclass.nodeinfo('node1')
98-
params = { 'test1': 1, 'test3': 3, '_reclass_': {'environment': u'base', 'name': {'full': 'node1', 'short': 'node1'}}}
98+
params = { 'test1': 1, 'test3': 3, '_reclass_': {'environment': u'base', 'name': {'full': 'node1', 'parts': ['node1'], 'path': 'node1', 'short': 'node1'}}}
9999
self.assertEqual(node['parameters'], params)
100100

101101
def test_merging_of_parameters_before_class_interpolation_enabling_overrides(self):

‎reclass/values/tests/test_compitem.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def test_assembleRefs_one_item_with_one_ref(self):
3030
composite = CompItem([val1], SETTINGS)
3131

3232
self.assertTrue(composite.has_references)
33-
self.assertEquals(composite.get_references(), expected_refs)
33+
self.assertEqual(composite.get_references(), expected_refs)
3434

3535
def test_assembleRefs_one_item_with_two_refs(self):
3636
val1 = Value('${foo}${bar}', SETTINGS, '')
@@ -39,7 +39,7 @@ def test_assembleRefs_one_item_with_two_refs(self):
3939
composite = CompItem([val1], SETTINGS)
4040

4141
self.assertTrue(composite.has_references)
42-
self.assertEquals(composite.get_references(), expected_refs)
42+
self.assertEqual(composite.get_references(), expected_refs)
4343

4444
def test_assembleRefs_two_items_one_with_one_ref_one_without(self):
4545
val1 = Value('${foo}bar', SETTINGS, '')
@@ -49,7 +49,7 @@ def test_assembleRefs_two_items_one_with_one_ref_one_without(self):
4949
composite = CompItem([val1, val2], SETTINGS)
5050

5151
self.assertTrue(composite.has_references)
52-
self.assertEquals(composite.get_references(), expected_refs)
52+
self.assertEqual(composite.get_references(), expected_refs)
5353

5454
def test_assembleRefs_two_items_both_with_one_ref(self):
5555
val1 = Value('${foo}', SETTINGS, '')
@@ -59,7 +59,7 @@ def test_assembleRefs_two_items_both_with_one_ref(self):
5959
composite = CompItem([val1, val2], SETTINGS)
6060

6161
self.assertTrue(composite.has_references)
62-
self.assertEquals(composite.get_references(), expected_refs)
62+
self.assertEqual(composite.get_references(), expected_refs)
6363

6464
def test_assembleRefs_two_items_with_two_refs(self):
6565
val1 = Value('${foo}${baz}', SETTINGS, '')
@@ -69,22 +69,22 @@ def test_assembleRefs_two_items_with_two_refs(self):
6969
composite = CompItem([val1, val2], SETTINGS)
7070

7171
self.assertTrue(composite.has_references)
72-
self.assertEquals(composite.get_references(), expected_refs)
72+
self.assertEqual(composite.get_references(), expected_refs)
7373

7474
def test_string_representation(self):
7575
composite = CompItem(Value(1, SETTINGS, ''), SETTINGS)
7676
expected = '1'
7777

7878
result = str(composite)
7979

80-
self.assertEquals(result, expected)
80+
self.assertEqual(result, expected)
8181

8282
def test_render_single_item(self):
8383
val1 = Value('${foo}', SETTINGS, '')
8484

8585
composite = CompItem([val1], SETTINGS)
8686

87-
self.assertEquals(1, composite.render({'foo': 1}, None))
87+
self.assertEqual(1, composite.render({'foo': 1}, None))
8888

8989

9090
def test_render_multiple_items(self):
@@ -93,7 +93,7 @@ def test_render_multiple_items(self):
9393

9494
composite = CompItem([val1, val2], SETTINGS)
9595

96-
self.assertEquals('12', composite.render({'foo': 1, 'bar': 2}, None))
96+
self.assertEqual('12', composite.render({'foo': 1, 'bar': 2}, None))
9797

9898
def test_merge_over_merge_scalar(self):
9999
val1 = Value(None, SETTINGS, '')
@@ -102,7 +102,7 @@ def test_merge_over_merge_scalar(self):
102102

103103
result = composite.merge_over(scalar)
104104

105-
self.assertEquals(result, composite)
105+
self.assertEqual(result, composite)
106106

107107
def test_merge_over_merge_composite(self):
108108
val1 = Value(None, SETTINGS, '')
@@ -112,7 +112,7 @@ def test_merge_over_merge_composite(self):
112112

113113
result = composite2.merge_over(composite1)
114114

115-
self.assertEquals(result, composite2)
115+
self.assertEqual(result, composite2)
116116

117117
def test_merge_other_types_not_allowed(self):
118118
other = type('Other', (object,), {'type': 34})

‎reclass/values/tests/test_item.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def test_assembleRef_allrefs(self):
2222

2323
iwr = ItemWithReferences([phonyitem], {})
2424

25-
self.assertEquals(iwr.get_references(), [1])
25+
self.assertEqual(iwr.get_references(), [1])
2626
self.assertTrue(iwr.allRefs)
2727

2828
def test_assembleRef_partial(self):
@@ -33,7 +33,7 @@ def test_assembleRef_partial(self):
3333

3434
iwr = ItemWithReferences([phonyitem], {})
3535

36-
self.assertEquals(iwr.get_references(), [1])
36+
self.assertEqual(iwr.get_references(), [1])
3737
self.assertFalse(iwr.allRefs)
3838

3939

@@ -42,7 +42,7 @@ class TestContainerItem(unittest.TestCase):
4242
def test_render(self):
4343
container = ContainerItem('foo', SETTINGS)
4444

45-
self.assertEquals(container.render(None, None), 'foo')
45+
self.assertEqual(container.render(None, None), 'foo')
4646

4747
if __name__ == '__main__':
4848
unittest.main()

‎reclass/values/tests/test_listitem.py

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

1919
result = listitem2.merge_over(listitem1)
2020

21-
self.assertEquals(result.contents, expected.contents)
21+
self.assertEqual(result.contents, expected.contents)
2222

2323
def test_merge_other_types_not_allowed(self):
2424
other = type('Other', (object,), {'type': 34})

‎reclass/values/tests/test_parser_functions.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def test_standard_reference_parser(self, data):
9494

9595
result = pf.listify(parser.parseString(instring).asList())
9696

97-
self.assertEquals(expected, result)
97+
self.assertEqual(expected, result)
9898

9999

100100
@ddt.ddt
@@ -109,7 +109,7 @@ def test_standard_reference_parser(self, data):
109109

110110
result = pf.listify(parser.parseString(instring).asList())
111111

112-
self.assertEquals(expected, result)
112+
self.assertEqual(expected, result)
113113

114114

115115
if __name__ == '__main__':

‎reclass/values/tests/test_refitem.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def test_assembleRefs_ok(self):
2323

2424
iwr = RefItem([phonyitem], {})
2525

26-
self.assertEquals(iwr.get_references(), ['foo', 'bar'])
26+
self.assertEqual(iwr.get_references(), ['foo', 'bar'])
2727
self.assertTrue(iwr.allRefs)
2828

2929
def test_assembleRefs_failedrefs(self):
@@ -34,15 +34,15 @@ def test_assembleRefs_failedrefs(self):
3434

3535
iwr = RefItem([phonyitem], {})
3636

37-
self.assertEquals(iwr.get_references(), ['foo'])
37+
self.assertEqual(iwr.get_references(), ['foo'])
3838
self.assertFalse(iwr.allRefs)
3939

4040
def test__resolve_ok(self):
4141
reference = RefItem('', Settings({'delimiter': ':'}))
4242

4343
result = reference._resolve('foo:bar', {'foo':{'bar': 1}})
4444

45-
self.assertEquals(result, 1)
45+
self.assertEqual(result, 1)
4646

4747
def test__resolve_fails(self):
4848
refitem = RefItem('', Settings({'delimiter': ':'}))

‎reclass/values/tests/test_scaitem.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ def test_merge_over_merge_scalar(self):
1717

1818
result = scalar2.merge_over(scalar1)
1919

20-
self.assertEquals(result.contents, scalar2.contents)
20+
self.assertEqual(result.contents, scalar2.contents)
2121

2222
def test_merge_over_merge_composite(self):
2323
scalar1 = CompItem(Value(1, SETTINGS, ''), SETTINGS)
2424
scalar2 = ScaItem([2], SETTINGS)
2525

2626
result = scalar2.merge_over(scalar1)
2727

28-
self.assertEquals(result.contents, scalar2.contents)
28+
self.assertEqual(result.contents, scalar2.contents)
2929

3030
def test_merge_other_types_not_allowed(self):
3131
other = type('Other', (object,), {'type': 34})

‎reclass/values/tests/test_value.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def test_simple_string(self):
4141
s = 'my cat likes to hide in boxes'
4242
tv = Value(s, SETTINGS, '')
4343
self.assertFalse(tv.has_references)
44-
self.assertEquals(tv.render(CONTEXT, None), s)
44+
self.assertEqual(tv.render(CONTEXT, None), s)
4545

4646
def _test_solo_ref(self, key):
4747
s = _var(key)

0 commit comments

Comments
 (0)