--- a/pvl/hosts/config.py Sun Mar 01 20:14:12 2015 +0200
+++ b/pvl/hosts/config.py Sun Mar 01 20:15:18 2015 +0200
@@ -319,7 +319,7 @@
Skips .dotfiles.
"""
- for name in os.listdir(root):
+ for name in sorted(os.listdir(root)):
path = os.path.join(root, name)
if name.startswith('.'):
--- a/pvl/hosts/tests.py Sun Mar 01 20:14:12 2015 +0200
+++ b/pvl/hosts/tests.py Sun Mar 01 20:15:18 2015 +0200
@@ -138,25 +138,25 @@
def testApplyIncludes(self):
self.assertHostsEqual(config.apply_hosts_files(self.options, ['etc/hosts/test']), [
+ ('bar@test', dict(
+ ip = ipaddr.IPAddress('192.0.2.2'),
+ )),
('foo@test', dict(
ip = ipaddr.IPAddress('192.0.2.1'),
)),
- ('bar@test', dict(
- ip = ipaddr.IPAddress('192.0.2.2'),
- )),
])
def testApplyIncludePath(self):
self.options.hosts_include = 'etc/hosts'
self.assertHostsEqual(config.apply_hosts_files(self.options, ['etc/zones/forward/test']), [
- ('foo@test', dict(
- ip = ipaddr.IPAddress('192.0.2.1'),
+ ('quux@asdf.test', dict(
+ ip = ipaddr.IPAddress('192.0.2.5'),
)),
('bar@test', dict(
ip = ipaddr.IPAddress('192.0.2.2'),
)),
- ('quux@asdf.test', dict(
- ip = ipaddr.IPAddress('192.0.2.5'),
+ ('foo@test', dict(
+ ip = ipaddr.IPAddress('192.0.2.1'),
)),
])