Projet

Général

Profil

Révision 8b97e6a3

ID8b97e6a32fefd9dcefe2c955dc74f1028c0b5e98
Parent a5f5fb12
Enfant def3893c

Ajouté par Steve Traylen il y a plus de 4 ans

Correct bad merge

There was a bad merge between

correct tests.

Voir les différences:

spec/classes/inet_filter_spec.rb
91 91 
          is_expected.to contain_concat__fragment('nftables-inet-filter-chain-INPUT-rule-accept_established_related').with(
92 92 
            target:  'nftables-inet-filter-chain-INPUT',
93 93 
            content: %r{^  ct state established,related accept$},
94 
            order:   '05',
94 
            order:   '05-nftables-inet-filter-chain-INPUT-rule-accept_established_related-b',
95 95 
          )
96 96 
        }
97 97 
        it {
98 98 
          is_expected.to contain_concat__fragment('nftables-inet-filter-chain-INPUT-rule-drop_invalid').with(
99 99 
            target:  'nftables-inet-filter-chain-INPUT',
100 100 
            content: %r{^  ct state invalid drop$},
101 
            order:   '06',
101 
            order:   '06-nftables-inet-filter-chain-INPUT-rule-drop_invalid-b',
102 102 
          )
103 103 
        }
104 104 
        it {
......
211 211 
          is_expected.to contain_concat__fragment('nftables-inet-filter-chain-OUTPUT-rule-accept_established_related').with(
212 212 
            target:  'nftables-inet-filter-chain-OUTPUT',
213 213 
            content: %r{^  ct state established,related accept$},
214 
            order:   '05',
214 
            order:   '05-nftables-inet-filter-chain-OUTPUT-rule-accept_established_related-b',
215 215 
          )
216 216 
        }
217 217 
        it {
218 218 
          is_expected.to contain_concat__fragment('nftables-inet-filter-chain-OUTPUT-rule-drop_invalid').with(
219 219 
            target:  'nftables-inet-filter-chain-OUTPUT',
220 220 
            content: %r{^  ct state invalid drop$},
221 
            order:   '06',
221 
            order:   '06-nftables-inet-filter-chain-OUTPUT-rule-drop_invalid-b',
222 222 
          )
223 223 
        }
224 224 
        it {

Formats disponibles : Unified diff