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

Correct bad merge #15

Merged
merged 1 commit into from
Nov 20, 2020
Merged

Correct bad merge #15

merged 1 commit into from
Nov 20, 2020

Conversation

traylenator
Copy link
Collaborator

@traylenator
Copy link
Collaborator Author

More over I think a lot of these tests could be removed. e.g.

it {
          is_expected.to contain_concat__fragment('nftables-inet-filter-chain-INPUT-rule-drop_invalid').with(
            target:  'nftables-inet-filter-chain-INPUT',
            content: %r{^  ct state invalid drop$},
            order:   '06',
            order:   '06-nftables-inet-filter-chain-INPUT-rule-drop_invalid-b',
          )
        }

being tested in inet_filter_spec.rb is I would say redundant now that nftables::rules is well covered by its own test.

Changing it for

it { is_expected to conain_nftables__rule('INPUT-drop_invalid).with(.... ) }

is good enough and easier to maintain moving forward.

@keachi keachi merged commit def3893 into voxpupuli:master Nov 20, 2020
@traylenator traylenator deleted the fixtests branch November 22, 2020 19:27
@traylenator traylenator added the bug Something isn't working label Dec 10, 2020
figless pushed a commit to figless/puppet-nftables that referenced this pull request Aug 25, 2021
def3893 Merge pull request voxpupuli#15 from traylenator/fixtests
8b97e6a Correct bad merge

git-subtree-dir: code
git-subtree-split: def3893
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants