added test method for assertion of empty uci values

tests/functional_tests.py

@@ -8,7 +8,7 @@ from nose.tools import (assert_equal, assert_not_equal, assert_in,
                         assert_true, assert_regexp_matches, timed)
 from webtest import TestApp
 
-from tests.utils import uci_get, uci_set, uci_commit
+from tests.utils import uci_get, uci_set, uci_commit, uci_is_empty
 import foris
 
 
@@ -84,6 +84,9 @@ class ForisTest(TestCase):
     def uci_get(self, path):
         return uci_get(path, self.config_directory)
 
+    def uci_is_empty(self, path):
+        return uci_is_empty(path, self.config_directory)
+
     def uci_set(self, path, value):
         return uci_set(path, value, self.config_directory)
 
@@ -217,6 +220,10 @@ class TestConfig(ForisTest):
         self.check_uci_val("network.lan.ipaddr", old_ip)
 
         # DHCP is by default enabled, change IP and disable it
+        try:
+            assert_true(self.uci_is_empty("dhcp.lan.ignore"))
+        except AssertionError:
+            self.check_uci_val("dhcp.lan.ignore", "0")
         form = invalid.forms['main-form']
         expected_ip = "192.168.1.2"
         form['lan_ipaddr'] = expected_ip

tests/utils.py

-from subprocess import check_output
+from subprocess import check_output, STDOUT
 
 
 def uci_get(path, config_directory=None):
@@ -10,6 +10,15 @@ def uci_get(path, config_directory=None):
     return check_output(args)[:-1]
 
 
+def uci_is_empty(path, config_directory=None):
+    args = ["uci", "get"]
+    if config_directory:
+        args.extend(["-c", config_directory])
+    args.append(path)
+    args.append("; exit 0")
+    return (check_output(" ".join(args), stderr=STDOUT, shell=True)) == "uci: Entry not found\n"
+
+
 def uci_set(path, value, config_directory=None):
     args = ["uci", "set"]
     if config_directory: