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