Skip to content

Commit 8c34558

Browse files
committed
flake8
1 parent 4bdeffc commit 8c34558

File tree

2 files changed

+28
-21
lines changed

2 files changed

+28
-21
lines changed

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -502,8 +502,9 @@ def testAuthorCanEdit(self, gatewaywrapper, author_testimg_generated):
502502
ctx = gatewaywrapper.gateway.getAdminService().getEventContext()
503503
uuid = ctx.sessionUuid
504504
gatewaywrapper.loginAsAdmin()
505-
gid = gatewaywrapper.gateway.createGroup("author-can-edit-test-%s" % uuid,
506-
member_Ids=[ctx.userId])
505+
gname = "author-can-edit-test-%s" % uuid
506+
gid = gatewaywrapper.gateway.createGroup(gname,
507+
member_Ids=[ctx.userId])
507508

508509
gatewaywrapper.loginAsUser()
509510
gatewaywrapper.gateway.setGroupForSession(gid)

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

+25-19
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,11 @@ def testConnectUsingClient(self, gatewaywrapper):
227227
gatewaywrapper.loginAsAdmin()
228228
username = "connect_test_user6"
229229
password = "foobar"
230-
connect_test_user = dbhelpers.UserEntry(
231-
username, password, firstname='User', lastname='ConnectUsingClient')
232-
chmod_test_user.create(gatewaywrapper.gateway, dbhelpers.ROOT.passwd)
230+
last_name = "ConnectUsingClient"
231+
test_user= dbhelpers.UserEntry(username, password,
232+
firstname='User',
233+
lastname=last_name)
234+
test_user.create(gatewaywrapper.gateway, dbhelpers.ROOT.passwd)
233235
gatewaywrapper.doDisconnect()
234236

235237
client = omero.client()
@@ -241,10 +243,11 @@ def testConnectUsingClientNoSessionWithIdentity(self, gatewaywrapper):
241243
gatewaywrapper.loginAsAdmin()
242244
username = "connect_test_user7"
243245
password = "foobar"
244-
connect_test_user = dbhelpers.UserEntry(
245-
username, password, firstname='User',
246-
lastname='ConnectUsingClientNoSessionWithIdentity')
247-
chmod_test_user.create(gatewaywrapper.gateway, dbhelpers.ROOT.passwd)
246+
last_name = "ConnectUsingClientNoSessionWithIdentity"
247+
test_user = dbhelpers.UserEntry(username, password,
248+
firstname='User',
249+
lastname=last_name)
250+
test_user.create(gatewaywrapper.gateway, dbhelpers.ROOT.passwd)
248251
gatewaywrapper.doDisconnect()
249252

250253
client = omero.client()
@@ -256,10 +259,11 @@ def testConnectUsingClientSessionWithoutIdentity(self, gatewaywrapper):
256259
gatewaywrapper.loginAsAdmin()
257260
username = "connect_test_user8"
258261
password = "foobar"
259-
connect_test_user = dbhelpers.UserEntry(
260-
username, password, firstname='User',
261-
lastname='ConnectUsingClientNoSessionWithoutIdentity')
262-
chmod_test_user.create(gatewaywrapper.gateway, dbhelpers.ROOT.passwd)
262+
last_name = "ConnectUsingClientSessionWithoutIdentity"
263+
test_user = dbhelpers.UserEntry(username, password,
264+
firstname='User',
265+
lastname=last_name)
266+
test_user.create(gatewaywrapper.gateway, dbhelpers.ROOT.passwd)
263267
gatewaywrapper.doDisconnect()
264268

265269
client = omero.client()
@@ -270,10 +274,11 @@ def testSessionId(self, gatewaywrapper):
270274
gatewaywrapper.loginAsAdmin()
271275
username = "session_test_user"
272276
password = "foobar"
273-
connect_test_user = dbhelpers.UserEntry(
274-
username, password, firstname='User',
275-
lastname='sessionId')
276-
chmod_test_user.create(gatewaywrapper.gateway, dbhelpers.ROOT.passwd)
277+
last_name = "SessionId"
278+
test_user = dbhelpers.UserEntry(username, password,
279+
firstname='User',
280+
lastname=last_name)
281+
test_user.create(gatewaywrapper.gateway, dbhelpers.ROOT.passwd)
277282
gatewaywrapper.doDisconnect()
278283

279284
client = omero.client()
@@ -287,10 +292,11 @@ def testConnectWithSessionId(self, gatewaywrapper):
287292
gatewaywrapper.loginAsAdmin()
288293
username = "connect_withsession_test_user"
289294
password = "foobar"
290-
connect_test_user = dbhelpers.UserEntry(
291-
username, password, firstname='User',
292-
lastname='connect_withsession')
293-
chmod_test_user.create(gatewaywrapper.gateway, dbhelpers.ROOT.passwd)
295+
last_name = "connect_withsessionId"
296+
test_user = dbhelpers.UserEntry(username, password,
297+
firstname='User',
298+
lastname=last_name)
299+
test_user.create(gatewaywrapper.gateway, dbhelpers.ROOT.passwd)
294300
gatewaywrapper.doDisconnect()
295301

296302
client = omero.client()

0 commit comments

Comments
 (0)