Fix tests for existing PR-312 (#337)

* use addrtype match to return the LOCAL trafik

* Add assertion for the new LOCAL firewall rule added in PR 312.

* Fix linter complaints
This commit is contained in:
Daniel Jeffery
2019-06-07 20:12:21 -06:00
committed by Brian May
parent 635cf8605e
commit 3e2ad68796
3 changed files with 15 additions and 2 deletions

View File

@ -602,8 +602,13 @@ def main(listenip_v6, listenip_v4,
except KeyError:
raise Fatal("User %s does not exist." % user)
required.ipv6 = len(subnets_v6) > 0 or listenip_v6 is not None
required.ipv4 = len(subnets_v4) > 0 or listenip_v4 is not None
if fw.method.name != 'nat':
required.ipv6 = len(subnets_v6) > 0 or listenip_v6 is not None
required.ipv4 = len(subnets_v4) > 0 or listenip_v4 is not None
else:
required.ipv6 = None
required.ipv4 = None
required.udp = avail.udp
required.dns = len(nslist) > 0
required.user = False if user is None else True