Regression on tests 7.3.4 and 7.3.5 (fixes crossbario#36); bump version

yanzf0417 · Aug 23, 2014 · 3d5508d · 3d5508d
1 parent b34c262
commit 3d5508d
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 59 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,32 +1,45 @@
-# Autobahn|Testsuite - Changelog
+# Changelog
+
+## v0.6.3
+
+* maintenance release
 
 ## v0.6.2
- * new mode for generating WAMP message serializations
+
+* new mode for generating WAMP message serializations
+
 ## v0.6.1
- * permessage-deflate tests with different parameters and fragmentation
+
+* permessage-deflate tests with different parameters and fragmentation
 
 ## v0.6.0
- * compatibility with Autobahn|Python 0.8.1
+
+* compatibility with Autobahn|Python 0.8.1
 
 ## v0.5.7
- * compatibility with Autobahn|Python 0.7.0
+
+* compatibility with Autobahn|Python 0.7.0
 
 ## v0.5.6
- * compatiblity with AutobahnPython 0.6.3
- * new test section for testing WebSocket compression extension (`permessage-deflate` etc)
- * beginning of WAMP testsuite
- * more UTF8 test strings
+
+* compatiblity with AutobahnPython 0.6.3
+* new test section for testing WebSocket compression extension (`permessage-deflate` etc)
+* beginning of WAMP testsuite
+* more UTF8 test strings
 
 ## v0.5.5
- * do not include invalid UTF8 test strings in report result pages (html/json)
+
+* do not include invalid UTF8 test strings in report result pages (html/json)
 
 ## v0.5.4
- * make Jython happy (now runs on Jython 2.7b1 with slightly patched Twisted)
- * add detailed description of how we generate public reports
- * log UTF8 and XOR masker classes in use
+
+* make Jython happy (now runs on Jython 2.7b1 with slightly patched Twisted)
+* add detailed description of how we generate public reports
+* log UTF8 and XOR masker classes in use
 
 ## v0.5.3
- * add JSON output for test results
- * WSS testing support
- * more UTF-8 tests
+
+* add JSON output for test results
+* WSS testing support
+* more UTF-8 tests
 
diff --git a/README.md b/README.md
@@ -14,38 +14,38 @@ and limits testing.
 
 **Autobahn**|Testsuite is used across the industry and contains over 500 test cases covering
 
- * Framing
- * Pings/Pongs
- * Reserved Bits
- * Opcodes
- * Fragmentation
- * UTF-8 Handling
- * Limits/Performance
- * Closing Handshake
- * Opening Handshake (under development)
- * WebSocket compression ([permessage-deflate extension](https://tools.ietf.org/html/draft-ietf-hybi-permessage-compression))
+* Framing
+* Pings/Pongs
+* Reserved Bits
+* Opcodes
+* Fragmentation
+* UTF-8 Handling
+* Limits/Performance
+* Closing Handshake
+* Opening Handshake (under development)
+* WebSocket compression ([permessage-deflate extension](https://tools.ietf.org/html/draft-ietf-hybi-permessage-compression))
 
 
 ## Other Tools
 
 Besides the automated testsuite (aka "fuzzing" server/client), **wstest**
 also includes a number of other handy modes:
 
- * WebSocket echo server and client
- * WebSocket broadcast server (and client driver)
- * Testee modes to test [AutobahnPython](http://autobahn.ws/python) against the test suite
- * **wsperf** controller and master (see below for more)
- * WAMP server and client, for developing WAMP implementations
- * WebSocket Mass-Connect
+* WebSocket echo server and client
+* WebSocket broadcast server (and client driver)
+* Testee modes to test [AutobahnPython](http://autobahn.ws/python) against the test suite
+* **wsperf** controller and master (see below for more)
+* WAMP server and client, for developing WAMP implementations
+* WebSocket Mass-Connect
 
 
 ## More Information
 
 For more information take a look at the [project documentation](http://autobahn.ws/testsuite). This provides:
 
- * [test reports](http://autobahn.ws/testsuite#reports)
- * [installation instructions](http://autobahn.ws/testsuite/installation.html)
- * [usage instructions](http://autobahn.ws/testsuite/usage.html)
+* [test reports](http://autobahn.ws/testsuite#reports)
+* [installation instructions](http://autobahn.ws/testsuite/installation.html)
+* [usage instructions](http://autobahn.ws/testsuite/usage.html)
 
 
 ## Get in Touch

diff --git a/autobahntestsuite/autobahntestsuite/_version.py b/autobahntestsuite/autobahntestsuite/_version.py
@@ -16,4 +16,4 @@
 ##
 ###############################################################################
 
-__version__ = "0.6.2"
+__version__ = "0.6.3"
diff --git a/autobahntestsuite/autobahntestsuite/case/case7_3_4.py b/autobahntestsuite/autobahntestsuite/case/case7_3_4.py
@@ -35,7 +35,7 @@ def onConnectionLost(self, failedByMe):
          self.passed = False
          self.result = self.resultClose 
    def onOpen(self):
-      self.payload = "Hello World!"
+      self.payload = u"Hello World!"
       self.expected[Case.OK] = []
       self.expectedClose = {"closedByMe":True,"closeCode":[self.p.CLOSE_STATUS_CODE_NORMAL],"requireClean":True}
       self.p.sendClose(self.p.CLOSE_STATUS_CODE_NORMAL,self.payload)

diff --git a/autobahntestsuite/autobahntestsuite/case/case7_3_5.py b/autobahntestsuite/autobahntestsuite/case/case7_3_5.py
@@ -36,7 +36,7 @@ def onConnectionLost(self, failedByMe):
          self.result = self.resultClose 
 
    def onOpen(self):
-      self.payload = "*" * 123
+      self.payload = u"*" * 123
       self.expected[Case.OK] = []
       self.expectedClose = {"closedByMe":True,"closeCode":[self.p.CLOSE_STATUS_CODE_NORMAL],"requireClean":True}
       self.p.sendClose(self.p.CLOSE_STATUS_CODE_NORMAL,self.payload)

diff --git a/autobahntestsuite/autobahntestsuite/serializer.py b/autobahntestsuite/autobahntestsuite/serializer.py
@@ -23,7 +23,7 @@
 import json
 import binascii
 from autobahn import wamp
-from autobahn.wamp.tests.test_serializer import generate_test_messages
+from autobahn.wamp.test.test_serializer import generate_test_messages
 
 
 def start(outfilename, debug = False):

diff --git a/autobahntestsuite/setup.py b/autobahntestsuite/setup.py
@@ -30,32 +30,32 @@
 
 Contains over 500 test cases covering
 
-   * Framing
-   * Pings/Pongs
-   * Reserved Bits
-   * Opcodes
-   * Fragmentation
-   * UTF-8 Handling
-   * Limits/Performance
-   * Closing Handshake
-   * Opening Handshake (under development)
-   * WebSocket compression (permessage-deflate extension)
+* Framing
+* Pings/Pongs
+* Reserved Bits
+* Opcodes
+* Fragmentation
+* UTF-8 Handling
+* Limits/Performance
+* Closing Handshake
+* Opening Handshake (under development)
+* WebSocket compression (permessage-deflate extension)
 
 Besides the automated test suite, wstest also includes a number
 of other handy developer tools:
 
-   * WebSocket echo server and client
-   * WebSocket broadcast server (and client driver)
-   * Testee modes to test Autobahn itself against the test suite
-   * wsperf controller and master (see http://www.zaphoyd.com/wsperf)
-   * WAMP server and client, for developing WAMP implementations
+* WebSocket echo server and client
+* WebSocket broadcast server (and client driver)
+* Testee modes to test Autobahn itself against the test suite
+* wsperf controller and master (see http://www.zaphoyd.com/wsperf)
+* WAMP server and client, for developing WAMP implementations
 
 More information:
 
-   * http://autobahn.ws/testsuite
-   * https://github.com/tavendo/AutobahnTestSuite
-   * http://tools.ietf.org/html/rfc6455
-   * http://wamp.ws
+* http://autobahn.ws/testsuite
+* https://github.com/tavendo/AutobahnTestSuite
+* http://tools.ietf.org/html/rfc6455
+* http://wamp.ws
 """
 
 
@@ -84,7 +84,7 @@
    url = 'http://autobahn.ws/testsuite',
    platforms = ('Any'),
    install_requires = ['setuptools',
-                       'autobahn[twisted]>=0.8.7',
+                       'autobahn[twisted]>=0.8.15',
                        'jinja2>=2.6',
                        'markupsafe>=0.19',
                        'Werkzeug>=0.9.4',