Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix even more tests #69

Merged
merged 6 commits into from
Mar 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion tests/integration/targets/cloud_init_data_facts/aliases
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ shippable/posix/group1
skip/aix
skip/osx
skip/freebsd
disabled #fixme
1 change: 0 additions & 1 deletion tests/integration/targets/connection_chroot/aliases
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
needs/root
shippable/posix/group3
disabled #fixme
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ chroot-pipelining ansible_ssh_pipelining=true
chroot-no-pipelining ansible_ssh_pipelining=false
[chroot:vars]
ansible_host=/
ansible_connection=chroot
ansible_connection=community.general.chroot
ansible_python_interpreter="{{ ansible_playbook_python }}"
1 change: 0 additions & 1 deletion tests/integration/targets/filter_random_mac/aliases
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
shippable/posix/group2
skip/python2.6 # filters are controller only, and we no longer support Python 2.6 on the controller
skip/aix
disabled # fixme
18 changes: 9 additions & 9 deletions tests/integration/targets/filter_random_mac/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

- name: Test random_mac filter bad argument value
debug:
var: "'dummy' | community.generalrandom_mac"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that was my typo, thanks for fixing.

var: "'dummy' | community.general.random_mac"
register: _bad_random_mac_filter
ignore_errors: yes

Expand All @@ -45,15 +45,15 @@
- name: Verify random_mac filter
assert:
that:
- "'00' | random_mac is match('^00:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]$')"
- "'00:00' | random_mac is match('^00:00:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]$')"
- "'00:00:00' | random_mac is match('^00:00:00:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]$')"
- "'00:00:00:00' | random_mac is match('^00:00:00:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]$')"
- "'00:00:00:00:00' | random_mac is match('^00:00:00:00:00:[a-f0-9][a-f0-9]$')"
- "'00:00:00' | random_mac != '00:00:00' | random_mac"
- "'00' | community.general.random_mac is match('^00:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]$')"
- "'00:00' | community.general.random_mac is match('^00:00:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]$')"
- "'00:00:00' | community.general.random_mac is match('^00:00:00:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]$')"
- "'00:00:00:00' | community.general.random_mac is match('^00:00:00:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]$')"
- "'00:00:00:00:00' | community.general.random_mac is match('^00:00:00:00:00:[a-f0-9][a-f0-9]$')"
- "'00:00:00' | community.general.random_mac != '00:00:00' | community.general.random_mac"

- name: Verify random_mac filter with seed
assert:
that:
- "'00:00:00' | communit.general.random_mac(seed='test') == '00:00:00' | random_mac(seed='test')"
- "'00:00:00' | community.general.random_mac(seed='test') != '00:00:00' | random_mac(seed='another_test')"
- "'00:00:00' | community.general.random_mac(seed='test') == '00:00:00' | community.general.random_mac(seed='test')"
- "'00:00:00' | community.general.random_mac(seed='test') != '00:00:00' | community.general.random_mac(seed='another_test')"
Empty file.
6 changes: 0 additions & 6 deletions tests/unit/module_utils/network/meraki/fixtures/orgs.json

This file was deleted.

160 changes: 0 additions & 160 deletions tests/unit/module_utils/network/meraki/test_meraki.py

This file was deleted.