Merge 2d9e288 into bd1b2dc

radius.py

@@ -389,9 +389,9 @@ def unpack(data):
         """
         pos, attrs = 0, {}
         while pos < len(data):
-            code, l = struct.unpack('BB', data[pos:pos + 2])
-            attrs[code] = data[pos + 2:pos + l]
-            pos += l
+            code, length = struct.unpack('BB', data[pos:pos + 2])
+            attrs[code] = data[pos + 2:pos + length]
+            pos += length
         return Attributes(attrs)
 
 
@@ -446,10 +446,10 @@ def pack(self):
     @staticmethod
     def unpack(secret, data):
         """Unpack the data into it's fields."""
-        code, id, l, authenticator = struct.unpack('!BBH16s', data[:20])
-        if l != len(data):
+        code, id, length, authenticator = struct.unpack('!BBH16s', data[:20])
+        if length != len(data):
             LOGGER.warning('Too much data!')
-        attrs = Attributes.unpack(data[20:l])
+        attrs = Attributes.unpack(data[20:length])
         return Message(secret, code, id, authenticator, attrs)
 
     def verify(self, data):

tests.py

@@ -3,6 +3,7 @@
 import socket
 import threading
 import logging
+import time
 
 try:
     from hashlib import md5
@@ -153,6 +154,12 @@ def setUp(self):
     def tearDown(self):
         self.sock.close()
 
+    def startServer(self, target):
+        t = threading.Thread(target=target)
+        t.daemon = True
+        t.start()
+        time.sleep(0.1)
+
     def test_connect(self):
         """Test connecting."""
         r = radius.Radius(TEST_SECRET, host='localhost', port=self.port)
@@ -170,9 +177,7 @@ def _reply_to_client():
             m2 = create_reply(m1)
             self.sock.sendto(m2.pack(), addr)
 
-        t = threading.Thread(target=_reply_to_client)
-        t.daemon = True
-        t.start()
+        self.startServer(_reply_to_client)
 
         r = radius.Radius(TEST_SECRET, host='localhost', port=self.port)
         self.assertFalse(r.authenticate('username', 'password'))
@@ -186,9 +191,7 @@ def _reply_to_client():
             m2 = create_reply(m1, radius.CODE_ACCESS_ACCEPT)
             self.sock.sendto(m2.pack(), addr)
 
-        t = threading.Thread(target=_reply_to_client)
-        t.daemon = True
-        t.start()
+        self.startServer(_reply_to_client)
 
         r = radius.Radius(TEST_SECRET, host='localhost', port=self.port)
         self.assertTrue(r.authenticate('username', 'password'))
@@ -205,9 +208,7 @@ def _reply_to_client():
             })
             self.sock.sendto(m2.pack(), addr)
 
-        t = threading.Thread(target=_reply_to_client)
-        t.daemon = True
-        t.start()
+        self.startServer(_reply_to_client)
 
         r = radius.Radius(TEST_SECRET, host='localhost', port=self.port)
         try: