From 25d6c405aff4167e801d0a4995083a56160b969e Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Thu, 20 Aug 2015 15:58:27 +0200 Subject: Imported Upstream version 0.1.39 --- reconfigure/tests/configs/ajenti_tests.py | 6 ++++-- reconfigure/tests/configs/base_test.py | 4 ++-- reconfigure/tests/configs/bind9_tests.py | 2 +- reconfigure/tests/configs/crontab_tests.py | 2 +- reconfigure/tests/configs/ctdb_tests.py | 2 +- reconfigure/tests/configs/dhcpd_tests.py | 2 +- reconfigure/tests/configs/exports_tests.py | 2 +- reconfigure/tests/configs/fstab_tests.py | 2 +- reconfigure/tests/configs/group_tests.py | 2 +- reconfigure/tests/configs/hosts_tests.py | 2 +- reconfigure/tests/configs/iptables_tests.py | 2 +- reconfigure/tests/configs/netatalk_tests.py | 3 ++- reconfigure/tests/configs/nsd_tests.py | 2 +- reconfigure/tests/configs/passwd_tests.py | 2 +- reconfigure/tests/configs/resolv_tests.py | 2 +- reconfigure/tests/configs/samba_tests.py | 14 ++++++++++++-- reconfigure/tests/configs/squid_tests.py | 2 +- reconfigure/tests/configs/supervisor_tests.py | 2 +- 18 files changed, 34 insertions(+), 21 deletions(-) (limited to 'reconfigure/tests/configs') diff --git a/reconfigure/tests/configs/ajenti_tests.py b/reconfigure/tests/configs/ajenti_tests.py index 56a1dc1..66a0526 100644 --- a/reconfigure/tests/configs/ajenti_tests.py +++ b/reconfigure/tests/configs/ajenti_tests.py @@ -1,7 +1,7 @@ import json from reconfigure.configs import AjentiConfig -from base_test import BaseConfigTest +from reconfigure.tests.configs.base_test import BaseConfigTest class AjentiConfigTest (BaseConfigTest): @@ -12,6 +12,7 @@ class AjentiConfigTest (BaseConfigTest): "host": "0.0.0.0", "port": 8000 }, + "language": null, "enable_feedback": true, "installation_id": null, "users": { @@ -34,6 +35,7 @@ class AjentiConfigTest (BaseConfigTest): 'authentication': False, 'enable_feedback': True, 'installation_id': None, + 'language': None, 'http_binding': {'host': '0.0.0.0', 'port': 8000}, 'ssl': {'certificate_path': '', 'enable': False}, 'users': {'test': { @@ -46,7 +48,7 @@ class AjentiConfigTest (BaseConfigTest): config = AjentiConfig - stringify_filter = staticmethod(json.loads) + stringify_filter = staticmethod(lambda x: json.loads(str(x))) del BaseConfigTest diff --git a/reconfigure/tests/configs/base_test.py b/reconfigure/tests/configs/base_test.py index 1824819..aefb13c 100644 --- a/reconfigure/tests/configs/base_test.py +++ b/reconfigure/tests/configs/base_test.py @@ -24,13 +24,13 @@ class BaseConfigTest (unittest.TestCase): #self.assertTrue(self.__class__.result== config.tree.to_dict()) a, b = self.__class__.result, config.tree.to_dict() if a != b: - print 'SOURCE: %s\nGENERATED: %s\n' % (json.dumps(a, indent=4), json.dumps(b, indent=4)) + print('SOURCE: %s\nGENERATED: %s\n' % (json.dumps(a, indent=4), json.dumps(b, indent=4))) self.assertEquals(a, b) result = config.save() s_filter = self.__class__.stringify_filter #print s_filter(result[None]) - for k, v in result.iteritems(): + for k, v in result.items(): self.assertEquals( s_filter(self.__class__.sources[k]), s_filter(v) diff --git a/reconfigure/tests/configs/bind9_tests.py b/reconfigure/tests/configs/bind9_tests.py index ee0c05a..fabbd2f 100644 --- a/reconfigure/tests/configs/bind9_tests.py +++ b/reconfigure/tests/configs/bind9_tests.py @@ -1,5 +1,5 @@ from reconfigure.configs import BIND9Config -from base_test import BaseConfigTest +from reconfigure.tests.configs.base_test import BaseConfigTest class BIND9ConfigTest (BaseConfigTest): diff --git a/reconfigure/tests/configs/crontab_tests.py b/reconfigure/tests/configs/crontab_tests.py index f1b28fe..15d0eff 100644 --- a/reconfigure/tests/configs/crontab_tests.py +++ b/reconfigure/tests/configs/crontab_tests.py @@ -1,5 +1,5 @@ from reconfigure.configs import CrontabConfig -from base_test import BaseConfigTest +from reconfigure.tests.configs.base_test import BaseConfigTest class CrontabConfigTest (BaseConfigTest): diff --git a/reconfigure/tests/configs/ctdb_tests.py b/reconfigure/tests/configs/ctdb_tests.py index 7437ef7..6ef81d9 100644 --- a/reconfigure/tests/configs/ctdb_tests.py +++ b/reconfigure/tests/configs/ctdb_tests.py @@ -1,5 +1,5 @@ from reconfigure.configs import CTDBConfig, CTDBNodesConfig, CTDBPublicAddressesConfig -from base_test import BaseConfigTest +from reconfigure.tests.configs.base_test import BaseConfigTest class CTDBNodesConfigTest (BaseConfigTest): diff --git a/reconfigure/tests/configs/dhcpd_tests.py b/reconfigure/tests/configs/dhcpd_tests.py index 73fbc74..eb98068 100644 --- a/reconfigure/tests/configs/dhcpd_tests.py +++ b/reconfigure/tests/configs/dhcpd_tests.py @@ -1,5 +1,5 @@ from reconfigure.configs import DHCPDConfig -from base_test import BaseConfigTest +from reconfigure.tests.configs.base_test import BaseConfigTest class DHCPDConfigTest (BaseConfigTest): diff --git a/reconfigure/tests/configs/exports_tests.py b/reconfigure/tests/configs/exports_tests.py index be85736..28b53d1 100644 --- a/reconfigure/tests/configs/exports_tests.py +++ b/reconfigure/tests/configs/exports_tests.py @@ -1,5 +1,5 @@ from reconfigure.configs import ExportsConfig -from base_test import BaseConfigTest +from reconfigure.tests.configs.base_test import BaseConfigTest class ExportsConfigTest (BaseConfigTest): diff --git a/reconfigure/tests/configs/fstab_tests.py b/reconfigure/tests/configs/fstab_tests.py index 9ffe19b..1232349 100644 --- a/reconfigure/tests/configs/fstab_tests.py +++ b/reconfigure/tests/configs/fstab_tests.py @@ -1,5 +1,5 @@ from reconfigure.configs import FSTabConfig -from base_test import BaseConfigTest +from reconfigure.tests.configs.base_test import BaseConfigTest class FSTabConfigTest (BaseConfigTest): diff --git a/reconfigure/tests/configs/group_tests.py b/reconfigure/tests/configs/group_tests.py index b53dc5c..d3c31fe 100644 --- a/reconfigure/tests/configs/group_tests.py +++ b/reconfigure/tests/configs/group_tests.py @@ -1,5 +1,5 @@ from reconfigure.configs import GroupConfig -from base_test import BaseConfigTest +from reconfigure.tests.configs.base_test import BaseConfigTest class GroupConfigTest (BaseConfigTest): diff --git a/reconfigure/tests/configs/hosts_tests.py b/reconfigure/tests/configs/hosts_tests.py index e202929..e90ed2a 100644 --- a/reconfigure/tests/configs/hosts_tests.py +++ b/reconfigure/tests/configs/hosts_tests.py @@ -1,5 +1,5 @@ from reconfigure.configs import HostsConfig -from base_test import BaseConfigTest +from reconfigure.tests.configs.base_test import BaseConfigTest class FSTabConfigTest (BaseConfigTest): diff --git a/reconfigure/tests/configs/iptables_tests.py b/reconfigure/tests/configs/iptables_tests.py index 335e081..f69f58f 100644 --- a/reconfigure/tests/configs/iptables_tests.py +++ b/reconfigure/tests/configs/iptables_tests.py @@ -1,5 +1,5 @@ from reconfigure.configs import IPTablesConfig -from base_test import BaseConfigTest +from reconfigure.tests.configs.base_test import BaseConfigTest class IPTablesConfigTest (BaseConfigTest): diff --git a/reconfigure/tests/configs/netatalk_tests.py b/reconfigure/tests/configs/netatalk_tests.py index ab9f693..c3bf1a6 100644 --- a/reconfigure/tests/configs/netatalk_tests.py +++ b/reconfigure/tests/configs/netatalk_tests.py @@ -1,5 +1,5 @@ from reconfigure.configs import NetatalkConfig -from base_test import BaseConfigTest +from reconfigure.tests.configs.base_test import BaseConfigTest class NetatalkConfigTest (BaseConfigTest): @@ -19,6 +19,7 @@ ea=sys "global": { "zeroconf": True, "cnid_listen": "localhost:4700", + "uam_list": 'uams_dhx.so,uams_dhx2.so', "afp_port": "123", }, "shares": [ diff --git a/reconfigure/tests/configs/nsd_tests.py b/reconfigure/tests/configs/nsd_tests.py index d91b0bd..03809e7 100644 --- a/reconfigure/tests/configs/nsd_tests.py +++ b/reconfigure/tests/configs/nsd_tests.py @@ -1,5 +1,5 @@ from reconfigure.configs import NSDConfig -from base_test import BaseConfigTest +from reconfigure.tests.configs.base_test import BaseConfigTest class NSDConfigTest (BaseConfigTest): diff --git a/reconfigure/tests/configs/passwd_tests.py b/reconfigure/tests/configs/passwd_tests.py index 8f9a5de..f0d797a 100644 --- a/reconfigure/tests/configs/passwd_tests.py +++ b/reconfigure/tests/configs/passwd_tests.py @@ -1,5 +1,5 @@ from reconfigure.configs import PasswdConfig -from base_test import BaseConfigTest +from reconfigure.tests.configs.base_test import BaseConfigTest class PasswdConfigTest (BaseConfigTest): diff --git a/reconfigure/tests/configs/resolv_tests.py b/reconfigure/tests/configs/resolv_tests.py index d7bedc8..37854e3 100644 --- a/reconfigure/tests/configs/resolv_tests.py +++ b/reconfigure/tests/configs/resolv_tests.py @@ -1,5 +1,5 @@ from reconfigure.configs import ResolvConfig -from base_test import BaseConfigTest +from reconfigure.tests.configs.base_test import BaseConfigTest class ResolvConfigTest (BaseConfigTest): diff --git a/reconfigure/tests/configs/samba_tests.py b/reconfigure/tests/configs/samba_tests.py index c6ce44c..7a5865c 100644 --- a/reconfigure/tests/configs/samba_tests.py +++ b/reconfigure/tests/configs/samba_tests.py @@ -1,5 +1,5 @@ from reconfigure.configs import SambaConfig -from base_test import BaseConfigTest +from reconfigure.tests.configs.base_test import BaseConfigTest class SambaConfigTest (BaseConfigTest): @@ -48,6 +48,11 @@ directory mask=0700 "guest_ok": False, "path": "", 'wide_links': False, + "fstype": "", + "force_create_mode": "000", + "force_directory_mode": "000", + "veto_files": "", + "write_list": "", }, { "name": "profiles", @@ -59,7 +64,12 @@ directory mask=0700 "read_only": True, "guest_ok": False, "path": "/home/samba/profiles", - 'wide_links': False + 'wide_links': False, + "fstype": "", + "force_create_mode": "000", + "force_directory_mode": "000", + "veto_files": "", + "write_list": "", } ] } diff --git a/reconfigure/tests/configs/squid_tests.py b/reconfigure/tests/configs/squid_tests.py index 011d4bf..81eaf87 100644 --- a/reconfigure/tests/configs/squid_tests.py +++ b/reconfigure/tests/configs/squid_tests.py @@ -1,5 +1,5 @@ from reconfigure.configs import SquidConfig -from base_test import BaseConfigTest +from reconfigure.tests.configs.base_test import BaseConfigTest class SquidConfigTest (BaseConfigTest): diff --git a/reconfigure/tests/configs/supervisor_tests.py b/reconfigure/tests/configs/supervisor_tests.py index 8656128..b304654 100644 --- a/reconfigure/tests/configs/supervisor_tests.py +++ b/reconfigure/tests/configs/supervisor_tests.py @@ -1,5 +1,5 @@ from reconfigure.configs import SupervisorConfig -from base_test import BaseConfigTest +from reconfigure.tests.configs.base_test import BaseConfigTest class SupervisorConfigTest (BaseConfigTest): -- cgit v1.2.3