Changeset 6608

Timestamp:

Jan 15, 2009, 11:23:22 PM (17 years ago)

Author:

roland

Message:

More unittest updates, and one bug fix in wllogic.py.

Location:

trunk/exodus

Files:

• tests/test_forms.py (modified) (1 diff)
• tests/test_wlipcalc.py (modified) (2 diffs)
• tests/test_wllogic.py (modified) (3 diffs)
• wllogic.py (modified) (1 diff)

trunk/exodus/tests/test_forms.py

@@ +1 @@
+import unittest
+
+from exodus.tests.base import BootstrapTestCase
+
+class FormsTest(BootstrapTestCase):
+    pass
+
+def suite():
+    s = unittest.TestSuite()
+    s.addTest(unittest.makeSuite(FormsTest))
+    return s

trunk/exodus/tests/test_wlipcalc.py

@@ +1 @@
+import unittest
 from exodus.tests.base import BootstrapTestCase
 
@@ -73 +74 @@
 
         self.failUnlessEqual(ipcalc.ips, ip_list)
+
+def suite():
+    s = unittest.TestSuite()
+    s.addTest(unittest.makeSuite(IPCalcTest))
+    return s

trunk/exodus/tests/test_wllogic.py

@@ -6 +6 @@
     def test_get_direction_choices(self):
         from exodus.wllogic import get_direction_choices as gdc
+        self.failUnlessEqual(gdc('n'), 'north')
         self.failUnlessEqual(gdc('nw'), 'north-west')
-        self.failUnlessEqual(gdc('n'), 'north')
+        self.failUnlessEqual(gdc('w'), 'west')
+        self.failUnlessEqual(gdc('sw'), 'south-west')
+        self.failUnlessEqual(gdc('s'), 'south')
+        self.failUnlessEqual(gdc('se'), 'south-east')
+        self.failUnlessEqual(gdc('e'), 'east')
+        self.failUnlessEqual(gdc('ne'), 'north-east')
+        self.failUnlessEqual(gdc('omni'), 'omnidirectional')
 
-    def test_new_ssid_for_(self):
-        class nic(object):
-            iface = 'ath0'     
-            class node(object):
-                name = 'CeTIM'
-                class network(object):
-                    name = 'wleiden.net'
+    def test_new_ssid(self):
+        #XXX: need to test 'ap', direction and multiple aps on one node.
+        class node(object):
+            name = 'CeTIM'
+        class network(object):
+            name = 'wleiden.net'
         from exodus.wllogic import new_ssid
-        ssid = new_ssid(nic())        
+        ssid = new_ssid(network(), node(), 'ath0')        
         
         self.failUnlessEqual(ssid, 'ath0.CeTIM.wleiden.net')
+
+    def test_new_ssid_for_existing_interface(self):
+        self.fail('Not yet implemented')
 
     def test_parse_show_addr(self):
@@ -95 +104 @@
         ip = free_master_ip(network) 
         self.failIf(ip in ip_list)
-        self.failUnlessEqual(ip, '172.16.2.1')
+        self.failUnlessEqual(ip, '172.16.3.1')
 
     def test_calc_subnet(self):
@@ -182 +191 @@
     s = unittest.TestSuite()
     s.addTest(unittest.makeSuite(WLLogic))
+    s.addTest(unittest.makeSuite(Link))
 
     return s

trunk/exodus/wllogic.py

@@ -19 +19 @@
 def new_ssid_for_existing_interface(nic):
     """A parser that can be called in an easier way than new_ssid."""
-    return new_ssid(nic.network,nic.node, nic.iface, nic.accesspoint, 
-            nic.get_direction_dislay())
+    return new_ssid(nic.node.network,nic.node, nic.iface, nic.accesspoint, 
+            nic.get_direction_display())
 
 def new_ssid(network, node, iface, accesspoint=False, direction=None):