Skip to content

Commit 5448ded

Browse files
authored
Merge pull request #6385 from jburel/remove_method
remove test using deprecated method
2 parents c5d36ce + 8ab7627 commit 5448ded

File tree

1 file changed

+0
-38
lines changed

1 file changed

+0
-38
lines changed

components/tools/OmeroPy/test/integration/gatewaytest/test_connection.py

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -42,44 +42,6 @@ def testMultiProcessSession(self, gatewaywrapper):
4242
c3, a.containedGroups(c3.getUserId())[1])
4343
c3.setGroupForSession(g)
4444

45-
# seppuku is deprecated: testClose below supersedes this test
46-
@pytest.mark.filterwarnings("ignore:.*U.*close.*:DeprecationWarning")
47-
def testSeppuku(self, gatewaywrapper, author_testimg):
48-
# author_testimg in args to make sure the image has been imported
49-
gatewaywrapper.loginAsAuthor()
50-
assert gatewaywrapper.getTestImage() is not None
51-
gatewaywrapper.gateway.seppuku()
52-
pytest.raises(Ice.ConnectionLostException, gatewaywrapper.getTestImage)
53-
gatewaywrapper._has_connected = False
54-
gatewaywrapper.doDisconnect()
55-
gatewaywrapper.loginAsAuthor()
56-
assert gatewaywrapper.getTestImage() is not None
57-
gatewaywrapper.gateway.seppuku(softclose=False)
58-
pytest.raises(Ice.ConnectionLostException, gatewaywrapper.getTestImage)
59-
gatewaywrapper._has_connected = False
60-
gatewaywrapper.doDisconnect()
61-
# Also make sure softclose does the right thing
62-
gatewaywrapper.loginAsAuthor()
63-
g2 = gatewaywrapper.gateway.clone()
64-
65-
def g2_getTestImage():
66-
return dbhelpers.getImage(g2, 'testimg1')
67-
assert g2.connect(gatewaywrapper.gateway._sessionUuid)
68-
assert gatewaywrapper.getTestImage() is not None
69-
assert g2_getTestImage() is not None
70-
g2.seppuku(softclose=True)
71-
pytest.raises(Ice.ConnectionLostException, g2_getTestImage)
72-
assert gatewaywrapper.getTestImage() is not None
73-
g2 = gatewaywrapper.gateway.clone()
74-
assert g2.connect(gatewaywrapper.gateway._sessionUuid)
75-
assert gatewaywrapper.getTestImage() is not None
76-
assert g2_getTestImage() is not None
77-
g2.seppuku(softclose=False)
78-
pytest.raises(Ice.ConnectionLostException, g2_getTestImage)
79-
pytest.raises(Ice.ObjectNotExistException, gatewaywrapper.getTestImage)
80-
gatewaywrapper._has_connected = False
81-
gatewaywrapper.doDisconnect()
82-
8345
def testClose(self, gatewaywrapper, author_testimg):
8446
# author_testimg in args to make sure the image has been imported
8547
gatewaywrapper.loginAsAuthor()

0 commit comments

Comments
 (0)