--- a/pvl/hosts/tests.py Thu Feb 26 19:16:25 2015 +0200
+++ b/pvl/hosts/tests.py Thu Feb 26 19:26:15 2015 +0200
@@ -130,20 +130,7 @@
])
def testApplyIncludes(self):
- self.assertHostsEqual(config.apply_hosts_files(self.options, ['etc/hosts/test/test']), [
- ('foo@test', dict(
- ip = ipaddr.IPAddress('192.0.2.1'),
- )),
- ('bar@test', dict(
- ip = ipaddr.IPAddress('192.0.2.2'),
- )),
- ])
-
- def testApplyDirectory(self):
- self.assertHostsEqual(config.apply_hosts_files(self.options, ['etc/hosts/test/']), [
- ('quux@asdf.test', dict(
- ip = ipaddr.IPAddress('192.0.2.5'),
- )),
+ self.assertHostsEqual(config.apply_hosts_files(self.options, ['etc/hosts/test']), [
('foo@test', dict(
ip = ipaddr.IPAddress('192.0.2.1'),
)),
@@ -153,7 +140,7 @@
])
def testApplyIncludePath(self):
- self.options.hosts_include = 'etc/hosts/test'
+ self.options.hosts_include = 'etc/hosts'
self.assertHostsEqual(config.apply_hosts_files(self.options, ['etc/zones/forward/test']), [
('quux@asdf.test', dict(
ip = ipaddr.IPAddress('192.0.2.5'),