extras-buildsys/common AuthedXMLRPCServer.py, 1.6.4.1, 1.6.4.2 XMLRPCServerProxy.py, 1.5.4.1, 1.5.4.2

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20987/common

Modified Files:
      Tag: STABLE_0_4
	AuthedXMLRPCServer.py XMLRPCServerProxy.py 
Log Message:
Make the test a bit more informative


Index: AuthedXMLRPCServer.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -u -r1.6.4.1 -r1.6.4.2
--- AuthedXMLRPCServer.py	24 Nov 2005 22:32:02 -0000	1.6.4.1
+++ AuthedXMLRPCServer.py	1 Dec 2005 03:16:43 -0000	1.6.4.2
@@ -103,10 +103,10 @@
 ###########################################################
 
 class ReqHandler:
-    def ping(self):
+    def ping(self, callerid, trynum):
         authinfo = get_authinfo()
-        print "AUTHINFO: %s" % authinfo
-        return "pong"
+        print "AUTHINFO(%d / %d): %s" % (callerid, trynum, authinfo)
+        return "pong %d / %d" % (num, trynum)
 
 class TestServer(AuthedSSLXMLRPCServer):
     """
@@ -119,8 +119,7 @@
     def auth_cb(self, request, client_address):
         import random
         peer_cert = request.get_peer_certificate()
-        email = peer_cert.get_subject().countryName
-        return "AUTH: %s - %d" % (email, random.randint(1, 100))
+        return peer_cert.get_subject().emailAddress
 
 
 if __name__ == '__main__':


Index: XMLRPCServerProxy.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -u -r1.5.4.1 -r1.5.4.2
--- XMLRPCServerProxy.py	24 Nov 2005 22:32:02 -0000	1.5.4.1
+++ XMLRPCServerProxy.py	1 Dec 2005 03:16:43 -0000	1.5.4.2
@@ -64,8 +64,9 @@
 _lock = threading.Lock()
 
 class TestClient(threading.Thread):
-    def __init__(self, certs):
+    def __init__(self, certs, num):
         self.server = PlgXMLRPCServerProxy("https://127.0.0.1:8886", certs, timeout=20)
+        self.num = i
         threading.Thread.__init__(self)
 
     def run(self):
@@ -74,7 +75,8 @@
         i = 0
         while i < 5:
 #            _lock.acquire()
-            print self.server.ping()
+            reply = self.server.ping(self.num, i)
+            print "TRY(%d / %d): %s" % (self.num, i, reply)
             time.sleep(0.05)
 #            _lock.release()
             i = i + 1
@@ -92,7 +94,7 @@
 
     i = 100
     while i > 0:
-        t = TestClient(certs)
+        t = TestClient(certs, i)
         print "Created thread %d." % i
         t.start()
         i = i - 1