Imported Upstream version 0.1.50+git20140603

4 files changed, 57 insertions, 6 deletions

diff --git a/reconfigure/tests/configs/ajenti_tests.py b/reconfigure/tests/configs/ajenti_tests.py
index 66a0526..aa1374b 100644
--- a/reconfigure/tests/configs/ajenti_tests.py
+++ b/reconfigure/tests/configs/ajenti_tests.py
@@ -40,6 +40,7 @@ class AjentiConfigTest (BaseConfigTest):
         'ssl': {'certificate_path': '', 'enable': False},
         'users': {'test': {
             'configs': {'a': {'data': {}, 'name': 'a'}},
+            'email': None,
             'name': 'test',
             'password': 'sha512',
             'permissions': ['section:Dash']
diff --git a/reconfigure/tests/configs/csf_tests.py b/reconfigure/tests/configs/csf_tests.py
new file mode 100644
index 0000000..1d60c27
--- /dev/null
+++ b/reconfigure/tests/configs/csf_tests.py
@@ -0,0 +1,37 @@
+from reconfigure.configs import CSFConfig
+from reconfigure.tests.configs.base_test import BaseConfigTest
+
+
+class CSFConfigTest (BaseConfigTest):
+    sources = {
+        None: """
+TESTING="1"
+TCP_IN="20,21,22,25,53,80,110,143,443,465,587,993,995"
+TCP_OUT="20,21,22,25,53,80,110,113,443"
+UDP_IN="20,21,53"
+UDP_OUT="20,21,53,113,123"
+IPV6="0"
+TCP6_IN="20,21,22,25,53,80,110,143,443,465,587,993,995"
+TCP6_OUT="20,21,22,25,53,80,110,113,443"
+UDP6_IN="20,21,53"
+UDP6_OUT="20,21,53,113,123"
+ETH_DEVICE=""
+ETH6_DEVICE=""
+"""
+    }
+    result = {
+        "tcp6_out": "20,21,22,25,53,80,110,113,443",
+        "testing": True,
+        "eth_device": "",
+        "tcp_in": "20,21,22,25,53,80,110,143,443,465,587,993,995",
+        "tcp6_in": "20,21,22,25,53,80,110,143,443,465,587,993,995",
+        "udp6_in": "20,21,53",
+        "tcp_out": "20,21,22,25,53,80,110,113,443",
+        "udp6_out": "20,21,53,113,123",
+        "ipv6": False,
+        "udp_in": "20,21,53",
+        "eth6_device": "",
+        "udp_out": "20,21,53,113,123"
+    }
+
+    config = CSFConfig
diff --git a/reconfigure/tests/configs/samba_tests.py b/reconfigure/tests/configs/samba_tests.py
index 7a5865c..2604639 100644
--- a/reconfigure/tests/configs/samba_tests.py
+++ b/reconfigure/tests/configs/samba_tests.py
@@ -49,10 +49,16 @@ directory mask=0700
                 "path": "",
                 'wide_links': False,
                 "fstype": "",
-                "force_create_mode": "000", 
+                "force_create_mode": "000",
                 "force_directory_mode": "000",
-                "veto_files": "", 
-                "write_list": "", 
+                "veto_files": "",
+                "write_list": "",
+                "dfree_command": "",
+                "force_group": "",
+                "force_user": "",
+                "valid_users": "",
+                "read_list": "",
+                "dfree_cache_time": "",
             },
             {
                 "name": "profiles",
@@ -66,10 +72,16 @@ directory mask=0700
                 "path": "/home/samba/profiles",
                 'wide_links': False,
                 "fstype": "",
-                "force_create_mode": "000", 
+                "force_create_mode": "000",
                 "force_directory_mode": "000",
-                "veto_files": "", 
-                "write_list": "", 
+                "veto_files": "",
+                "write_list": "",
+                "dfree_command": "",
+                "force_group": "",
+                "force_user": "",
+                "valid_users": "",
+                "read_list": "",
+                "dfree_cache_time": "",
             }
         ]
     }
diff --git a/reconfigure/tests/configs/supervisor_tests.py b/reconfigure/tests/configs/supervisor_tests.py
index b304654..644f78a 100644
--- a/reconfigure/tests/configs/supervisor_tests.py
+++ b/reconfigure/tests/configs/supervisor_tests.py
@@ -16,6 +16,7 @@ command=cat
     result = {
         "programs": [
             {
+                "comment": None,
                 "autorestart": None,
                 "name": "test1",
                 "startsecs": None,