* fixed network unittests

* disabled unfinished blockdevice test

plugins/network/network.py

@@ -162,7 +162,8 @@ class network(cryptobox.plugins.base.CryptoBoxPlugin):
     def get_status(self):
         """The current IP is the status of this feature.
         """
-        return "%d.%d.%d.%d" % self.__get_current_ip()[1]
+        #TODO: also return nm & gw for unittests
+        return "%d.%d.%d.%d" % self.__get_current_ip()[0]
 
 
 

plugins/network/unittests.py

@@ -53,6 +53,7 @@ class unittests(WebInterfaceTestClass):
             self.cmd.submit()
             ## sleep a little bit longer than the delay necessary for ip-change
             time.sleep(CHANGE_IP_DELAY + 3)
+        ## set invalid IPs and check if the original IP stays the same
         set_ip([1,-2,0,1])
         self.assertEquals(orig_ip_text, get_current_ip())
         set_ip([1,0,0,256])
@@ -63,9 +64,17 @@ class unittests(WebInterfaceTestClass):
         new_ip[3] = str((int(orig_ip_octs[3]) + 128) % 256)
         set_ip(new_ip)
         self.assertEquals(".".join(new_ip), get_current_ip())
+        ## finally restore the original address
         set_ip(orig_ip_octs)
         self.assertEquals(orig_ip_text, get_current_ip())
 
+    def test_nm_change(self):
+        '''Change netmask address.'''
+        print "ToDo: Implement this!"
+
+    def test_gw_change(self):
+        '''Change gateway address.'''
+        print "ToDo: Implement this!"
 
     def test_inputs(self):
         """Check various input patterns for 'network' plugin.