Commit f4439fbc authored by Jim Fulton's avatar Jim Fulton

don't run the msgpack tests against the ZEO4 server

parent 5fe64971
...@@ -1465,34 +1465,35 @@ def ClientDisconnected_errors_are_TransientErrors(): ...@@ -1465,34 +1465,35 @@ def ClientDisconnected_errors_are_TransientErrors():
True True
""" """
if os.environ.get('ZEO_MSGPACK'): if not os.environ.get('ZEO4_SERVER'):
def test_runzeo_msgpack_support(): if os.environ.get('ZEO_MSGPACK'):
""" def test_runzeo_msgpack_support():
>>> import ZEO """
>>> import ZEO
>>> a, s = ZEO.server(threaded=False) >>> a, s = ZEO.server(threaded=False)
>>> conn = ZEO.connection(a) >>> conn = ZEO.connection(a)
>>> str(conn.db().storage.protocol_version.decode('ascii')) >>> str(conn.db().storage.protocol_version.decode('ascii'))
'M5' 'M5'
>>> conn.close(); s() >>> conn.close(); s()
""" """
else: else:
def test_runzeo_msgpack_support(): def test_runzeo_msgpack_support():
""" """
>>> import ZEO >>> import ZEO
>>> a, s = ZEO.server(threaded=False) >>> a, s = ZEO.server(threaded=False)
>>> conn = ZEO.connection(a) >>> conn = ZEO.connection(a)
>>> str(conn.db().storage.protocol_version.decode('ascii')) >>> str(conn.db().storage.protocol_version.decode('ascii'))
'Z5' 'Z5'
>>> conn.close(); s() >>> conn.close(); s()
>>> a, s = ZEO.server(zeo_conf=dict(msgpack=True), threaded=False) >>> a, s = ZEO.server(zeo_conf=dict(msgpack=True), threaded=False)
>>> conn = ZEO.connection(a) >>> conn = ZEO.connection(a)
>>> str(conn.db().storage.protocol_version.decode('ascii')) >>> str(conn.db().storage.protocol_version.decode('ascii'))
'M5' 'M5'
>>> conn.close(); s() >>> conn.close(); s()
""" """
if sys.platform.startswith('win'): if sys.platform.startswith('win'):
del runzeo_logrotate_on_sigusr2 del runzeo_logrotate_on_sigusr2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment