Tanky Woo
914eb60d51
Fix iptables target options with no arguments
...
For example:
- name: test
jump: CT
notrack: ''
...
2016-08-16 16:00:00 +08:00
Tarjei Husøy
387ac2ce5e
Support match-sets in iptables module
...
Based on work by @l13t in https://github.com/saltstack/salt/pull/29426 .
Added tests and fixed incorrect appending of the built rule.
Closes #29423 .
2015-12-15 16:35:06 -08:00
Colton Myers
d76d62877d
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/modules/git.py
salt/renderers/gpg.py
salt/utils/__init__.py
2015-11-17 16:24:43 -07:00
Christoph Glaubitz
8639e3e9c3
closes #28784
...
In fact this test will fail on the current code, but that is like
intended. This tests the fix of #28783 , which was introduced in 2015.5.
2015-11-16 20:30:37 +01:00
Mike Place
9cc897fd69
Fix tests for #24985
2015-07-13 16:19:21 -06:00
Tarjei Husøy
64f661d2cc
Add missing jump arguments to iptables module
...
I think this is all the arguments supported.
Also adds test for no-arg options and adds some docs on no-arg.
Point to discuss:
- The --save option crashes with our defined --save option. Probably
no rush since no one's complained so far, but this should be fixed.
Maybe we can rename this one to connsecmark-save, since it only appears
as an option to the CONNSECMARK jump target? Maybe also rename restore
to connsecmark-restore too, for consistency, even though restore
doesn't collide with anything?
2015-05-04 13:19:23 +02:00
rallytime
8c55294212
Remove pylint disable/enable comments
2015-03-10 15:56:07 -06:00
rallytime
254c17d910
Just use nested with statements instead of \ contiuation
...
Python 2.6 doesn't like that.
This should fix the test errors we are seeing on CentOS 6 and
Ubuntu 10 in the test suite.
2015-03-10 15:11:39 -06:00
Justin Findlay
7a49e3e877
fix test lint
2015-03-09 16:00:10 -06:00
Justin Findlay
2c04a36efa
fix iptables tests
2015-03-09 15:09:55 -06:00
Tarjei Husøy
5e05fd717a
Quote iptables args with leading/trailing spaces
2015-02-12 16:35:33 +01:00
Tarjei Husøy
9f6dfb5a04
Remove lots of string concatenation in iptables module
2015-02-11 23:25:45 +01:00
Tarjei Husøy
943be9f0b3
Remove a lot of duplication in iptables module
2015-02-11 23:24:07 +01:00
Tarjei Husøy
9afc8fca8a
Add support for iptables --log-* arguments
2015-02-11 23:24:06 +01:00
Tarjei Husøy
aeb91b000c
Refactor after_jump handling in iptaples module
2015-02-11 23:23:20 +01:00
Justin Findlay
657b79912e
fix iptables unit tests for merge forward
2015-02-11 10:52:07 -07:00
Pedro Algarvio
62e9407903
Merge pull request #20349 from rallytime/develop_pylint
...
Develop pylint
2015-02-04 11:58:39 +00:00
Justin Findlay
334245170a
add mocks to fix test when iptables cmd is absent
2015-02-03 13:22:22 -07:00
rallytime
244ba09cfc
Python 3 compat for several new test files
2015-02-03 11:34:49 -07:00
Jayesh Kariya
d1b4fce53e
removed pylint error
2015-02-03 13:34:01 +05:30
Jayesh Kariya
1ae01547e3
adding iptables unit test case
2015-02-03 12:02:56 +05:30