Permalink
Browse files

make ident consistent

  • Loading branch information...
1 parent cc1eb66 commit 1402fd28de5e97586abc87eb8f0f00e00acaaafc @oberstet oberstet committed Mar 19, 2012
Showing with 7 additions and 7 deletions.
  1. +7 −7 autobahntestsuite/autobahntestsuite/fuzzing.py
@@ -21,6 +21,8 @@
from twisted.python import log
from twisted.internet import reactor
+# for versions
+import autobahn
import autobahntestsuite
from autobahn.websocket import WebSocketProtocol, \
@@ -523,7 +525,7 @@ def createMasterReport(self, outdir):
## write report header
##
f.write(' <div id="master_report_header" class="block">\n')
- f.write(' <p id="intro">Summary report generated on %s (UTC) by <a href="%s">Autobahn WebSockets Testsuite</a> v%s.</p>\n' % (utcnow(), "http://autobahn.ws/testsuite", str(autobahntestsuite.version)))
+ f.write(' <p id="intro">Summary report generated on %s (UTC) by <a href="%s">Autobahn WebSockets Testsuite</a> v%s/v%s.</p>\n' % (utcnow(), "http://autobahn.ws/testsuite", autobahntestsuite.version, autobahn.version))
f.write("""
<table id="case_outcome_desc">
<tr>
@@ -1030,7 +1032,7 @@ def __init__(self, spec):
##
self.setSessionParameters(url = spec["url"],
protocols = spec.get("protocols", []),
- server = "AutobahnWebSocketsTestSuite/%s" % autobahntestsuite.version)
+ server = "AutobahnTestSuite/%s-%s" % (autobahntestsuite.version, autobahn.version))
## WebSocket protocol options
##
@@ -1039,7 +1041,7 @@ def __init__(self, spec):
self.spec = spec
self.specCases = parseSpecCases(self.spec)
self.specExcludeAgentCases = parseExcludeAgentCases(self.spec)
- print "Autobahn WebSockets %s Fuzzing Server (Port %d%s)" % (autobahntestsuite.version, self.port, ' TLS' if self.isSecure else '')
+ print "Autobahn WebSockets %s/%s Fuzzing Server (Port %d%s)" % (autobahntestsuite.version, autobahn.version, self.port, ' TLS' if self.isSecure else '')
print "Ok, will run %d test cases for any clients connecting" % len(self.specCases)
print "Cases = %s" % str(self.specCases)
@@ -1079,7 +1081,7 @@ def __init__(self, spec):
self.spec = spec
self.specCases = parseSpecCases(self.spec)
self.specExcludeAgentCases = parseExcludeAgentCases(self.spec)
- print "Autobahn WebSockets %s Fuzzing Client" % autobahntestsuite.version
+ print "Autobahn WebSockets %s/%s Fuzzing Client" % (autobahntestsuite.version, autobahn.version)
print "Ok, will run %d test cases against %d servers" % (len(self.specCases), len(spec["servers"]))
print "Cases = %s" % str(self.specCases)
print "Servers = %s" % str([x["url"] + "@" + x["agent"] for x in spec["servers"]])
@@ -1101,15 +1103,13 @@ def nextServer(self):
## agent (=server) string for reports
##
self.agent = server.get("agent", "UnknownServer")
- if self.agent == "AutobahnServer":
- self.agent = "AutobahnServer/%s" % autobahntestsuite.version
## WebSocket session parameters
##
self.setSessionParameters(url = server["url"],
origin = server.get("origin", None),
protocols = server.get("protocols", []),
- useragent = "AutobahnWebSocketsTestSuite/%s" % autobahntestsuite.version)
+ useragent = "AutobahnTestSuite/%s-%s" % (autobahntestsuite.version, autobahn.version))
## WebSocket protocol options
##

0 comments on commit 1402fd2

Please sign in to comment.