Changeset 1009

Timestamp:

09/01/07 13:00:51 (15 months ago)

Author:

wichert

Message:

More test work

Location:

trunk

Files:

• pyrad/dictionary.py (modified) (1 diff)
• pyrad/tests/data/simple (modified) (1 diff)
• pyrad/tests/testDictionary.py (modified) (2 diffs)
• setup.cfg (added)

trunk/pyrad/dictionary.py

@@ -123 +123 @@
         
 
+        def __len__(self):
+                return len(self.attributes)
+
         def __getitem__(self, key):
                 return self.attributes[key]

trunk/pyrad/tests/data/simple

@@ -1 +1 @@
 # A simple dictionary
 
-Attribute  Test-String       1       string
-Attribute  Test-Octets       2       octets
-Attribute  Test-Integer      3       integer
-Attribute  Test-Ip-Address   4       ipaddr
-Attribute  Test-Ipv6-Address 5       ipv6addr
-Attribute  Test-If-Id        6       ifid
-Attribute  Test-Date         7       date
-Attribute  Test-Abinary      8       abinary
+ATTRIBUTE  Test-String       1       string
+ATTRIBUTE  Test-Octets       2       octets
+ATTRIBUTE  Test-Integer      3       integer
+ATTRIBUTE  Test-Ip-Address   4       ipaddr
+ATTRIBUTE  Test-Ipv6-Address 5       ipv6addr
+ATTRIBUTE  Test-If-Id        6       ifid
+ATTRIBUTE  Test-Date         7       date
+ATTRIBUTE  Test-Abinary      8       abinary
 

trunk/pyrad/tests/testDictionary.py

@@ -21 +21 @@
     def testParseSimpleDictionary(self):
         dict=Dictionary(os.path.join(self.path, "simple"))
-        self.assertEqual(len(dict), 5)
+        self.assertEqual(len(dict), 8)
         values = [
                 ( "Test-String", 1, "string" ),
@@ -36 +36 @@
             attr=dict[attr]
             self.assertEqual(attr.code, code)
-            self.assertEqual(attr.datatype, type)
+            self.assertEqual(attr.type, type)