PROTON-1385: remove various skips etc from tests that are no longer applicable
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/cac0fc43 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/cac0fc43 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/cac0fc43 Branch: refs/heads/master Commit: cac0fc437c6170bfe4183d1311302ad5b0826174 Parents: ccdcf32 Author: Robert Gemmell <rob...@apache.org> Authored: Mon Jan 9 15:01:48 2017 +0000 Committer: Robert Gemmell <rob...@apache.org> Committed: Mon Jan 9 15:01:48 2017 +0000 ---------------------------------------------------------------------- tests/python/proton_tests/engine.py | 25 ++----------------------- tests/python/proton_tests/messenger.py | 2 -- tests/python/proton_tests/reactor.py | 8 ++------ tests/python/proton_tests/sasl.py | 23 ----------------------- tests/python/proton_tests/ssl.py | 6 ------ tests/python/proton_tests/utils.py | 2 -- 6 files changed, 4 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/cac0fc43/tests/python/proton_tests/engine.py ---------------------------------------------------------------------- diff --git a/tests/python/proton_tests/engine.py b/tests/python/proton_tests/engine.py index 497bb7d..05e9f8f 100644 --- a/tests/python/proton_tests/engine.py +++ b/tests/python/proton_tests/engine.py @@ -240,16 +240,10 @@ class ConnectionTest(Test): self.c1.transport.channel_max = value self.c1.open() self.pump() - if "java" in sys.platform: - assert self.c1.transport.channel_max == 65535, (self.c1.transport.channel_max, value) - else: - assert self.c1.transport.channel_max == 32767, (self.c1.transport.channel_max, value) + assert self.c1.transport.channel_max == 32767, (self.c1.transport.channel_max, value) def test_channel_max_raise_and_lower(self): - if "java" in sys.platform: - upper_limit = 65535 - else: - upper_limit = 32767 + upper_limit = 32767 # It's OK to lower the max below upper_limit. self.c1.transport.channel_max = 12345 @@ -308,9 +302,6 @@ class ConnectionTest(Test): assert c2.state == Endpoint.LOCAL_ACTIVE | Endpoint.REMOTE_CLOSED def test_user_config(self): - if "java" in sys.platform: - raise Skipped("Unsupported API") - self.c1.user = "vindaloo" self.c1.password = "secret" self.c1.open() @@ -747,8 +738,6 @@ class LinkTest(Test): assert self.rcv.remote_snd_settle_mode == Link.SND_UNSETTLED def test_max_message_size(self): - if "java" in sys.platform: - raise Skipped() assert self.snd.max_message_size == 0 assert self.rcv.remote_max_message_size == 0 self.snd.max_message_size = 13579 @@ -2030,8 +2019,6 @@ class ServerTest(Test): def testKeepalive(self): """ Verify that idle frames are sent to keep a Connection alive """ - if "java" in sys.platform: - raise Skipped() idle_timeout = self.delay server = common.TestServer() server.start() @@ -2063,8 +2050,6 @@ class ServerTest(Test): """ Verify that a Connection is terminated properly when Idle frames do not arrive in a timely manner. """ - if "java" in sys.platform: - raise Skipped() idle_timeout = self.delay server = common.TestServer(idle_timeout=idle_timeout) server.start() @@ -2652,8 +2637,6 @@ class DeliverySegFaultTest(Test): class SaslEventTest(CollectorTest): def testAnonymousNoInitialResponse(self): - if "java" in sys.platform: - raise Skipped() conn = Connection() conn.collect(self.collector) transport = Transport(Transport.SERVER) @@ -2671,8 +2654,6 @@ class SaslEventTest(CollectorTest): self.expect() def testPipelinedServerReadFirst(self): - if "java" in sys.platform: - raise Skipped() conn = Connection() conn.collect(self.collector) transport = Transport(Transport.CLIENT) @@ -2701,8 +2682,6 @@ class SaslEventTest(CollectorTest): assert server.sasl().outcome == SASL.OK def testPipelinedServerWriteFirst(self): - if "java" in sys.platform: - raise Skipped() conn = Connection() conn.collect(self.collector) transport = Transport(Transport.CLIENT) http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/cac0fc43/tests/python/proton_tests/messenger.py ---------------------------------------------------------------------- diff --git a/tests/python/proton_tests/messenger.py b/tests/python/proton_tests/messenger.py index 8da068e..7e08c98 100644 --- a/tests/python/proton_tests/messenger.py +++ b/tests/python/proton_tests/messenger.py @@ -1053,8 +1053,6 @@ class IdleTimeoutTest(common.Test): Verify that a Messenger connection is kept alive using empty idle frames when a idle_timeout is advertised by the remote peer. """ - if "java" in sys.platform: - raise Skipped() idle_timeout_secs = self.delay try: http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/cac0fc43/tests/python/proton_tests/reactor.py ---------------------------------------------------------------------- diff --git a/tests/python/proton_tests/reactor.py b/tests/python/proton_tests/reactor.py index 424570d..8a3a6af 100644 --- a/tests/python/proton_tests/reactor.py +++ b/tests/python/proton_tests/reactor.py @@ -473,12 +473,8 @@ class ContainerTest(Test): def test_no_virtual_host(self): # explicitly setting an empty virtual host should prevent the hostname - # field from being sent in the Open performative - if "java" in sys.platform: - # This causes Python Container to *not* set the connection virtual - # host, so when proton-j sets up the connection the virtual host - # seems to be unset and the URL's host is used (as expected). - raise SkipTest("Does not apply for proton-j"); + # field from being sent in the Open performative when using the + # Python Container. server_handler = ContainerTest._ServerHandler("localhost") container = Container(server_handler) conn = container.connect(url=Url(host="localhost", http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/cac0fc43/tests/python/proton_tests/sasl.py ---------------------------------------------------------------------- diff --git a/tests/python/proton_tests/sasl.py b/tests/python/proton_tests/sasl.py index 0f5f525..c23ef97 100644 --- a/tests/python/proton_tests/sasl.py +++ b/tests/python/proton_tests/sasl.py @@ -104,10 +104,6 @@ class SaslTest(Test): # We have to generate the client frames manually because proton does not # generate pipelined SASL and AMQP frames together def testIllegalProtocolLayering(self): - # TODO: Skip Proton-J for now - if "java" in sys.platform: - raise Skipped("Proton-J does not set error condition on protocol layering violation") - # Server self.s2.allowed_mechs('ANONYMOUS') @@ -139,10 +135,6 @@ class SaslTest(Test): assert not c2.state & Endpoint.REMOTE_ACTIVE def testPipelinedClient(self): - # TODO: When PROTON-1136 is fixed then remove this test - if "java" in sys.platform: - raise Skipped("Proton-J does not support pipelined client input") - # Server self.s2.allowed_mechs('ANONYMOUS') @@ -200,9 +192,6 @@ class SaslTest(Test): assert c1.state & Endpoint.REMOTE_ACTIVE def testPipelined2(self): - if "java" in sys.platform: - raise Skipped("Proton-J does not support client pipelining") - out1 = self.t1.peek(1024) self.t1.pop(len(out1)) self.t2.push(out1) @@ -291,8 +280,6 @@ class SaslTest(Test): assert self.t1.condition != None def testMechNotFound(self): - if "java" in sys.platform: - raise Skipped("Proton-J does not support checking authentication state") self.c1 = Connection() self.c1.open() self.t1.bind(self.c1) @@ -397,8 +384,6 @@ class SSLSASLTest(Test): self.c2 = Connection() def testSSLPlainSimple(self): - if "java" in sys.platform: - raise Skipped("Proton-J does not support SSL with SASL") if not SASL.extended(): raise Skipped("Simple SASL server does not support PLAIN") common.ensureCanTestExtendedSASL() @@ -416,8 +401,6 @@ class SSLSASLTest(Test): _testSaslMech(self, mech, encrypted=True) def testSSLPlainSimpleFail(self): - if "java" in sys.platform: - raise Skipped("Proton-J does not support SSL with SASL") if not SASL.extended(): raise Skipped("Simple SASL server does not support PLAIN") common.ensureCanTestExtendedSASL() @@ -435,9 +418,6 @@ class SSLSASLTest(Test): _testSaslMech(self, mech, clientUser='usr@proton', encrypted=True, authenticated=False) def testSSLExternalSimple(self): - if "java" in sys.platform: - raise Skipped("Proton-J does not support SSL with SASL") - if os.name=="nt": extUser = 'O=Client, CN=127.0.0.1' else: @@ -462,9 +442,6 @@ class SSLSASLTest(Test): _testSaslMech(self, mech, clientUser=None, authUser=extUser, encrypted=True) def testSSLExternalSimpleFail(self): - if "java" in sys.platform: - raise Skipped("Proton-J does not support SSL with SASL") - mech = 'EXTERNAL' self.server_domain.set_credentials(_sslCertpath("server-certificate.pem"), http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/cac0fc43/tests/python/proton_tests/ssl.py ---------------------------------------------------------------------- diff --git a/tests/python/proton_tests/ssl.py b/tests/python/proton_tests/ssl.py index 89fe828..566fefa 100644 --- a/tests/python/proton_tests/ssl.py +++ b/tests/python/proton_tests/ssl.py @@ -189,9 +189,6 @@ class SslTest(common.Test): if os.name=="nt": raise Skipped("Windows support for certificate fingerprint and subfield not implemented yet") - if "java" in sys.platform: - raise Skipped("Not yet implemented in Proton-J") - self.server_domain.set_credentials(self._testpath("server-certificate.pem"), self._testpath("server-private-key.pem"), "server-password") @@ -967,9 +964,6 @@ class MessengerSSLTests(common.Test): password="server-password", exception=None): import sys - # java doesn't do validation in the same way (yet) - if exception and "java" in sys.platform: - raise Skipped() self.server.certificate = _testpath(cert) self.server.private_key = _testpath(key) self.server.password = password http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/cac0fc43/tests/python/proton_tests/utils.py ---------------------------------------------------------------------- diff --git a/tests/python/proton_tests/utils.py b/tests/python/proton_tests/utils.py index 0766eb9..52d0dc2 100644 --- a/tests/python/proton_tests/utils.py +++ b/tests/python/proton_tests/utils.py @@ -136,8 +136,6 @@ class SyncRequestResponseTest(Test): def test_allowed_mechs_external(self): # All this test does it make sure that if we pass allowed_mechs to BlockingConnection, it is actually used. - if "java" in sys.platform: - raise Skipped("") port = free_tcp_port() server = ConnPropertiesServer(Url(host="127.0.0.1", port=port), timeout=self.timeout) server.start() --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
