[minion-cvs] Make all unit tests pass again, without deprecation war...

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria:/tmp/cvs-serv28142/lib/mixminion

Modified Files:
	Packet.py test.py 
Log Message:
Make all unit tests pass again, without deprecation warnings or failures.

Index: Packet.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Packet.py,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- Packet.py	9 Aug 2005 16:12:42 -0000	1.84
+++ Packet.py	31 Dec 2007 20:11:54 -0000	1.85
@@ -549,7 +549,8 @@
     def pack(self):
         """Returns the external representation of this reply block"""
         return struct.pack(RB_UNPACK_PATTERN,
-                           "SURB", 0x00, 0x01, self.timestamp, self.header,
+                           "SURB", 0x00, 0x01, long(self.timestamp),
+                           self.header,
                            len(self.routingInfo), self.routingType,
                            self.encryptionKey) + self.routingInfo
 

Index: test.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/test.py,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- test.py	2 Dec 2005 19:56:35 -0000	1.220
+++ test.py	31 Dec 2007 20:11:54 -0000	1.221
@@ -7046,12 +7046,12 @@
         si = ServerInfo(string=edesc['Lisa'][1],assumeValid=1)
         self.assert_(ks.getServerInfo(si) is si)
         try:
-            suspendLog()
+            suspendLog("DEBUG")
             si = ServerInfo(string=edesc['Lisa'][0],assumeValid=1)
             self.assert_(ks.getServerInfo(si) is None)
         finally:
             s = resumeLog()
-        self.assert_(stringContains(s, "Server is not currently"))
+        self.assert_(stringContains(s, "Time-invalid"))
 
         ##
         # Now try out the directory.  This is tricky; we add the other