[DefaultRenderer] minor whitespace improvement

openwisp · Oct 20, 2015 · bfa74e6 · bfa74e6
1 parent 84f0455
commit bfa74e6
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/netjsonconfig/backends/base.py b/netjsonconfig/backends/base.py
@@ -24,6 +24,8 @@ def cleanup(self, output):
         # convert True to 1 and False to 0
         output = output.replace('True', '1')\
                        .replace('False', '0')
+        # max 2 consecutive \n delimiters
+        output  = output.replace('\n\n\n', '\n\n')
         # if output is present
         # ensure it always ends with 1 new line
         if output.endswith('\n\n'):

diff --git a/netjsonconfig/backends/openwrt/templates/default.uci b/netjsonconfig/backends/openwrt/templates/default.uci
@@ -16,7 +16,8 @@
                     {% endif %}
                 {% endif %}
             {% endfor %}
-        {% endfor %}
 
+        {% endfor %}
+
     {% endfor %}
 {% endif %}
diff --git a/tests/openwrt/test_default.py b/tests/openwrt/test_default.py
@@ -38,6 +38,21 @@ def test_default(self):
                         "132/0",
                         "143/0"
                     ]
+                },
+                {
+                    "config_name": "rule",
+                    "name": "Rule2",
+                    "src": "wan",
+                    "proto": "icmp",
+                    "src_ip": "192.168.1.1/24",
+                    "family": "ipv4",
+                    "target": "ACCEPT",
+                    "icmp_type": [
+                        "130/0",
+                        "131/0",
+                        "132/0",
+                        "143/0"
+                    ]
                 }
             ]
         })
@@ -55,6 +70,18 @@ def test_default(self):
     option src_ip 'fe80::/10'
     option target 'ACCEPT'
 
+config rule
+    option family 'ipv4'
+    list icmp_type '130/0'
+    list icmp_type '131/0'
+    list icmp_type '132/0'
+    list icmp_type '143/0'
+    option name 'Rule2'
+    option proto 'icmp'
+    option src 'wan'
+    option src_ip '192.168.1.1/24'
+    option target 'ACCEPT'
+
 package luci
 
 config core 'main'
@@ -78,4 +105,4 @@ def test_warning(self):
                 }
             ]
         })
-        self.assertEqual(o.render(), 'package luci\n\n')
+        self.assertEqual(o.render(), 'package luci\n')