diff --git a/components/tools/OmeroPy/test/integration/gatewaytest/test_connection.py b/components/tools/OmeroPy/test/integration/gatewaytest/test_connection.py index 398940f514c..4c86c166b54 100644 --- a/components/tools/OmeroPy/test/integration/gatewaytest/test_connection.py +++ b/components/tools/OmeroPy/test/integration/gatewaytest/test_connection.py @@ -45,44 +45,6 @@ def testMultiProcessSession(self, gatewaywrapper): c3, a.containedGroups(c3.getUserId())[1]) c3.setGroupForSession(g) - # seppuku is deprecated: testClose below supersedes this test - @pytest.mark.filterwarnings("ignore:.*U.*close.*:DeprecationWarning") - def testSeppuku(self, gatewaywrapper, author_testimg): - # author_testimg in args to make sure the image has been imported - gatewaywrapper.loginAsAuthor() - assert gatewaywrapper.getTestImage() is not None - gatewaywrapper.gateway.seppuku() - pytest.raises(Ice.ConnectionLostException, gatewaywrapper.getTestImage) - gatewaywrapper._has_connected = False - gatewaywrapper.doDisconnect() - gatewaywrapper.loginAsAuthor() - assert gatewaywrapper.getTestImage() is not None - gatewaywrapper.gateway.seppuku(softclose=False) - pytest.raises(Ice.ConnectionLostException, gatewaywrapper.getTestImage) - gatewaywrapper._has_connected = False - gatewaywrapper.doDisconnect() - # Also make sure softclose does the right thing - gatewaywrapper.loginAsAuthor() - g2 = gatewaywrapper.gateway.clone() - - def g2_getTestImage(): - return dbhelpers.getImage(g2, 'testimg1') - assert g2.connect(gatewaywrapper.gateway._sessionUuid) - assert gatewaywrapper.getTestImage() is not None - assert g2_getTestImage() is not None - g2.seppuku(softclose=True) - pytest.raises(Ice.ConnectionLostException, g2_getTestImage) - assert gatewaywrapper.getTestImage() is not None - g2 = gatewaywrapper.gateway.clone() - assert g2.connect(gatewaywrapper.gateway._sessionUuid) - assert gatewaywrapper.getTestImage() is not None - assert g2_getTestImage() is not None - g2.seppuku(softclose=False) - pytest.raises(Ice.ConnectionLostException, g2_getTestImage) - pytest.raises(Ice.ObjectNotExistException, gatewaywrapper.getTestImage) - gatewaywrapper._has_connected = False - gatewaywrapper.doDisconnect() - def testClose(self, gatewaywrapper, author_testimg): # author_testimg in args to make sure the image has been imported gatewaywrapper.loginAsAuthor()