Skip to content

Commit adffb82

Browse files
authored
Maintaining for Tests and other not module related things (#33)
* add ignore for ansible 2.16 * comment deps for unit test * add 2.17 * fix loader.py which fails in sanity test * fix links in readme
1 parent cc8875d commit adffb82

File tree

5 files changed

+41
-16
lines changed

5 files changed

+41
-16
lines changed

.github/workflows/ansible-test.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ jobs:
2323
- stable-2.12
2424
- stable-2.13
2525
- stable-2.14
26+
- stable-2.15
27+
- stable-2.16
2628
- devel
2729

2830
runs-on: >-
@@ -32,7 +34,7 @@ jobs:
3234
steps:
3335

3436
- name: Check out code
35-
uses: actions/checkout@v3
37+
uses: actions/checkout@v4
3638

3739
- name: Perform sanity testing with ansible-test
3840
uses: ansible-community/ansible-test-gh-action@release/v1
@@ -58,20 +60,22 @@ jobs:
5860
- stable-2.12
5961
- stable-2.13
6062
- stable-2.14
63+
- stable-2.15
64+
- stable-2.16
6165
- devel
6266

6367
steps:
6468
- name: Check out code
65-
uses: actions/checkout@v3
69+
uses: actions/checkout@v4
6670

6771
- name: Perform unit testing with ansible-test
6872
uses: ansible-community/ansible-test-gh-action@release/v1
6973
with:
7074
ansible-core-version: ${{ matrix.ansible }}
7175
testing-type: units
72-
test-deps: >-
73-
ansible.netcommon
74-
ansible.utils
76+
# test-deps: >-
77+
# ansible.netcommon
78+
# ansible.utils
7579

7680
# Please consult the Readme for information on why we disabled integration tests temporarily.
7781

README.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ Tested Ansible versions:
7171
- 2.12
7272
- 2.13
7373
- 2.14
74+
- 2.15
75+
- 2.16
7476
- devel
7577

7678
Tested Python versions:
@@ -102,14 +104,14 @@ For some modules the below requirements are needed on the host that executes a m
102104
## Included content
103105

104106
- **Modules**:
105-
- [sap_hdbsql](https://docs.ansible.com/ansible/latest/collections/community/sap_libs/sap_hdbsql.html)
106-
- [sap_task_list_execute](https://docs.ansible.com/ansible/latest/collections/community/sap_libs/sap_task_list_execute.html)
107-
- [sapcar_extract](https://docs.ansible.com/ansible/latest/collections/community/sap_libs/sapcar_extract.html)
108-
- [sap_company](https://docs.ansible.com/ansible/latest/collections/community/sap_libs/sap_company.html)
109-
- [sap_snote](https://docs.ansible.com/ansible/latest/collections/community/sap_libs/sap_snote.html)
110-
- [sap_user](https://docs.ansible.com/ansible/latest/collections/community/sap_libs/sap_user.html)
111-
- [sap_system_facts](https://docs.ansible.com/ansible/latest/collections/community/sap_libs/sap_system_facts.html)
112-
- [sap_control_exec](https://docs.ansible.com/ansible/latest/collections/community/sap_libs/sap_control_exec.html)
107+
- [sap_hdbsql](https://docs.ansible.com/ansible/latest/collections/community/sap_libs/sap_hdbsql_module.html)
108+
- [sap_task_list_execute](https://docs.ansible.com/ansible/latest/collections/community/sap_libs/sap_task_list_execute_module.html)
109+
- [sapcar_extract](https://docs.ansible.com/ansible/latest/collections/community/sap_libs/sapcar_extract_module.html)
110+
- [sap_company](https://docs.ansible.com/ansible/latest/collections/community/sap_libs/sap_company_module.html)
111+
- [sap_snote](https://docs.ansible.com/ansible/latest/collections/community/sap_libs/sap_snote_module.html)
112+
- [sap_user](https://docs.ansible.com/ansible/latest/collections/community/sap_libs/sap_user_module.html)
113+
- [sap_system_facts](https://docs.ansible.com/ansible/latest/collections/community/sap_libs/sap_system_facts_module.html)
114+
- [sap_control_exec](https://docs.ansible.com/ansible/latest/collections/community/sap_libs/sap_control_exec_module.html)
113115

114116
## Using this collection
115117

tests/sanity/ignore-2.16.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
plugins/modules/sap_pyrfc.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
2+
plugins/modules/sap_company.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
3+
plugins/modules/sap_control_exec.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
4+
plugins/modules/sap_hdbsql.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
5+
plugins/modules/sap_snote.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
6+
plugins/modules/sap_system_facts.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
7+
plugins/modules/sap_task_list_execute.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
8+
plugins/modules/sap_user.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
9+
plugins/modules/sapcar_extract.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0

tests/sanity/ignore-2.17.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
plugins/modules/sap_pyrfc.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
2+
plugins/modules/sap_company.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
3+
plugins/modules/sap_control_exec.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
4+
plugins/modules/sap_hdbsql.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
5+
plugins/modules/sap_snote.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
6+
plugins/modules/sap_system_facts.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
7+
plugins/modules/sap_task_list_execute.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
8+
plugins/modules/sap_user.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0
9+
plugins/modules/sapcar_extract.py validate-modules:missing-gplv3-license # Licensed under Apache 2.0

tests/unit/mock/loader.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
# (c) 2012-2014, Michael DeHaan <michael.dehaan@gmail.com>
1+
# Copyright (c) 2012-2014, Michael DeHaan <michael.dehaan@gmail.com>
22
#
3-
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
3+
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
4+
# SPDX-License-Identifier: GPL-3.0-or-later
45

56
from __future__ import (absolute_import, division, print_function)
67
__metaclass__ = type
@@ -16,7 +17,7 @@ class DictDataLoader(DataLoader):
1617

1718
def __init__(self, file_mapping=None):
1819
file_mapping = {} if file_mapping is None else file_mapping
19-
assert type(file_mapping) == dict
20+
assert isinstance(file_mapping, dict)
2021

2122
super(DictDataLoader, self).__init__()
2223

0 commit comments

Comments
 (0)