david/jmc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

first passed component tests

Browse Source 
Make the first component tests pass by correcting XMLDummyServer and xmldiff (in tests/utils.py)

darcs-hash:20051127155735-684f5-82dc72186ef66c59ac9671f83d1ec90ea66ee5b1.gz
This commit is contained in:
dax
2005-11-27 16:57:35 +01:00
parent 9fa2df5563
commit 9f15a1a0d6
7 changed files with 207 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/dummy_server.py
View File

@@ -24,6 +24,7 @@ import sys
import time
import traceback
import re
import os
import socket
import types
import select
@@ -114,7 +115,7 @@ class XMLDummyServer(DummyServer):
# received size is based on the expected size in self.queries
data = conn.recv(1024 + len(self.queries[idx]))
if data:
print "-----------RECEIVE " + data
# print "-----------RECEIVE " + data
r = self._reader.feed(data)
except:
type, value, stack = sys.exc_info()
@@ -131,7 +132,7 @@ class XMLDummyServer(DummyServer):
else:
response = self.responses[idx]
if response is not None:
print >>sys.stderr, '---------SENDING : ', response
# print >>sys.stderr, '---------SENDING : ', response
conn.send(response)
conn.close()
except:
@@ -143,15 +144,21 @@ class XMLDummyServer(DummyServer):
def verify_queries(self):
result = True
queries_len = len(self.queries)
if queries_len == len(self.real_queries):
if queries_len == len(self.real_queries):
full_real_queries = ""
full_recv_queries = ""
for idx in range(queries_len):
real_query = xml.dom.minidom.parseString(self.real_queries[idx])
recv_query = xml.dom.minidom.parseString(self.queries[idx])
if not utils.xmldiff(real_query, recv_query):
result = False
print >>sys.stderr, "Unexpected query :\n" + \
"Expected query : _" + self.queries[idx] + "_\n" + \
"Receive query : _" + self.real_queries[idx] + "_\n"
full_real_queries += self.real_queries[idx].rstrip(os.linesep)
full_recv_queries += self.queries[idx].rstrip(os.linesep)
# Do not receive it but add it so that xml parsing can succeed
full_real_queries += "</stream:stream>"
real_query = xml.dom.minidom.parseString(full_real_queries)
recv_query = xml.dom.minidom.parseString(full_recv_queries)
try:
utils.xmldiff(real_query, recv_query)
except Exception, msg:
result = False
print >>sys.stderr, msg
else:
result = False
print >>sys.stderr, "Expected " + str(queries_len) + \