Skip to content

Commit f2cf965

Browse files
dirkkuldirkkul
committed
Better variable names
1 parent a3a7208 commit f2cf965

1 file changed

Lines changed: 61 additions & 61 deletions

File tree

‎integration/test_users.py‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -83,28 +83,28 @@ def test_create_user_and_get(client_factory: ClientFactory, request: SubRequest)
8383
if client._connection._weaviate_version.is_lower_than(1, 30, 0):
8484
pytest.skip("This test requires Weaviate 1.30.0 or higher")
8585

86-
randomUserName = _unique_user_id(request.node.name)
87-
apiKey = client.users.db.create(user_id=randomUserName)
86+
user_id = _unique_user_id(request.node.name)
87+
api_key = client.users.db.create(user_id=user_id)
8888
with weaviate.connect_to_local(
89-
port=RBAC_PORTS[0], grpc_port=RBAC_PORTS[1], auth_credentials=Auth.api_key(apiKey)
89+
port=RBAC_PORTS[0], grpc_port=RBAC_PORTS[1], auth_credentials=Auth.api_key(api_key)
9090
) as client2:
9191
user = client2.users.get_my_user()
92-
assert user.user_id == randomUserName
93-
dynamicUser = client.users.db.get(user_id=randomUserName)
94-
assert dynamicUser is not None
95-
assert dynamicUser.user_id == randomUserName
96-
assert dynamicUser.user_type == UserTypes.DB_DYNAMIC
97-
assert client.users.db.delete(user_id=randomUserName)
92+
assert user.user_id == user_id
93+
dynamic_user = client.users.db.get(user_id=user_id)
94+
assert dynamic_user is not None
95+
assert dynamic_user.user_id == user_id
96+
assert dynamic_user.user_type == UserTypes.DB_DYNAMIC
97+
assert client.users.db.delete(user_id=user_id)
9898

9999

100100
def test_delete_user(client_factory: ClientFactory, request: SubRequest) -> None:
101101
with client_factory(ports=RBAC_PORTS, auth_credentials=Auth.api_key("admin-key")) as client:
102102
if client._connection._weaviate_version.is_lower_than(1, 30, 0):
103103
pytest.skip("This test requires Weaviate 1.30.0 or higher")
104104

105-
randomUserName = _unique_user_id(request.node.name)
106-
client.users.db.create(user_id=randomUserName)
107-
assert client.users.db.delete(user_id=randomUserName)
105+
user_id = _unique_user_id(request.node.name)
106+
client.users.db.create(user_id=user_id)
107+
assert client.users.db.delete(user_id=user_id)
108108

109109
assert not client.users.db.delete(user_id="I-do-not-exist")
110110

@@ -114,93 +114,93 @@ def test_rotate_user_key(client_factory: ClientFactory, request: SubRequest) ->
114114
if client._connection._weaviate_version.is_lower_than(1, 30, 0):
115115
pytest.skip("This test requires Weaviate 1.30.0 or higher")
116116

117-
randomUserName = _unique_user_id(request.node.name)
118-
apiKey = client.users.db.create(user_id=randomUserName)
117+
user_id = _unique_user_id(request.node.name)
118+
api_key = client.users.db.create(user_id=user_id)
119119
with weaviate.connect_to_local(
120-
port=RBAC_PORTS[0], grpc_port=RBAC_PORTS[1], auth_credentials=Auth.api_key(apiKey)
120+
port=RBAC_PORTS[0], grpc_port=RBAC_PORTS[1], auth_credentials=Auth.api_key(api_key)
121121
) as client2:
122122
user = client2.users.get_my_user()
123-
assert user.user_id == randomUserName
123+
assert user.user_id == user_id
124124

125-
apiKeyNew = client.users.db.rotate_key(user_id=randomUserName)
125+
api_key_new = client.users.db.rotate_key(user_id=user_id)
126126
with weaviate.connect_to_local(
127-
port=RBAC_PORTS[0], grpc_port=RBAC_PORTS[1], auth_credentials=Auth.api_key(apiKeyNew)
127+
port=RBAC_PORTS[0], grpc_port=RBAC_PORTS[1], auth_credentials=Auth.api_key(api_key_new)
128128
) as client2:
129129
user = client2.users.get_my_user()
130-
assert user.user_id == randomUserName
130+
assert user.user_id == user_id
131131

132-
assert client.users.db.delete(user_id=randomUserName)
132+
assert client.users.db.delete(user_id=user_id)
133133

134134

135135
def test_de_activate(client_factory: ClientFactory, request: SubRequest) -> None:
136136
with client_factory(ports=RBAC_PORTS, auth_credentials=Auth.api_key("admin-key")) as client:
137137
if client._connection._weaviate_version.is_lower_than(1, 30, 0):
138138
pytest.skip("This test requires Weaviate 1.30.0 or higher")
139139

140-
randomUserName = _unique_user_id(request.node.name)
141-
client.users.db.create(user_id=randomUserName)
140+
user_id = _unique_user_id(request.node.name)
141+
client.users.db.create(user_id=user_id)
142142

143-
assert client.users.db.deactivate(user_id=randomUserName)
143+
assert client.users.db.deactivate(user_id=user_id)
144144
assert not client.users.db.deactivate(
145-
user_id=randomUserName
145+
user_id=user_id
146146
) # second deactivation returns a conflict => false
147-
user = client.users.db.get(user_id=randomUserName)
147+
user = client.users.db.get(user_id=user_id)
148148
assert not user.active
149-
assert client.users.db.activate(user_id=randomUserName)
149+
assert client.users.db.activate(user_id=user_id)
150150
assert not client.users.db.activate(
151-
user_id=randomUserName
151+
user_id=user_id
152152
) # second activation returns a conflict => false
153-
user = client.users.db.get(user_id=randomUserName)
153+
user = client.users.db.get(user_id=user_id)
154154
assert user.active
155155

156-
client.users.db.delete(user_id=randomUserName)
156+
client.users.db.delete(user_id=user_id)
157157

158158

159159
def test_deactivate_and_revoke(client_factory: ClientFactory, request: SubRequest) -> None:
160160
with client_factory(ports=RBAC_PORTS, auth_credentials=Auth.api_key("admin-key")) as client:
161161
if client._connection._weaviate_version.is_lower_than(1, 30, 0):
162162
pytest.skip("This test requires Weaviate 1.30.0 or higher")
163163

164-
randomUserName = _unique_user_id(request.node.name)
165-
apiKeyOld = client.users.db.create(user_id=randomUserName)
166-
assert client.users.db.deactivate(user_id=randomUserName, revoke_key=True)
164+
user_id = _unique_user_id(request.node.name)
165+
api_key_old = client.users.db.create(user_id=user_id)
166+
assert client.users.db.deactivate(user_id=user_id, revoke_key=True)
167167

168168
with pytest.raises(weaviate.exceptions.UnexpectedStatusCodeError):
169169
weaviate.connect_to_local(
170170
port=RBAC_PORTS[0],
171171
grpc_port=RBAC_PORTS[1],
172-
auth_credentials=Auth.api_key(apiKeyOld),
172+
auth_credentials=Auth.api_key(api_key_old),
173173
)
174174

175175
# re-activating is not enough
176-
assert client.users.db.activate(user_id=randomUserName)
176+
assert client.users.db.activate(user_id=user_id)
177177
with pytest.raises(weaviate.exceptions.UnexpectedStatusCodeError):
178178
weaviate.connect_to_local(
179179
port=RBAC_PORTS[0],
180180
grpc_port=RBAC_PORTS[1],
181-
auth_credentials=Auth.api_key(apiKeyOld),
181+
auth_credentials=Auth.api_key(api_key_old),
182182
)
183183

184-
apiKeyNew = client.users.db.rotate_key(user_id=randomUserName)
184+
api_key_new = client.users.db.rotate_key(user_id=user_id)
185185

186186
with weaviate.connect_to_local(
187-
port=RBAC_PORTS[0], grpc_port=RBAC_PORTS[1], auth_credentials=Auth.api_key(apiKeyNew)
187+
port=RBAC_PORTS[0], grpc_port=RBAC_PORTS[1], auth_credentials=Auth.api_key(api_key_new)
188188
) as client2:
189189
user = client2.users.get_my_user()
190-
assert user.user_id == randomUserName
190+
assert user.user_id == user_id
191191

192-
client.users.db.delete(user_id=randomUserName)
192+
client.users.db.delete(user_id=user_id)
193193

194194

195195
def test_deprecated_syntax(client_factory: ClientFactory, request: SubRequest) -> None:
196196
with client_factory(ports=RBAC_PORTS, auth_credentials=Auth.api_key("admin-key")) as client:
197197
if client._connection._weaviate_version.is_lower_than(1, 30, 0):
198198
pytest.skip("This test requires Weaviate 1.30.0 or higher")
199-
randomUserName = _unique_user_id(request.node.name)
200-
client.users.db.create(user_id=randomUserName)
201-
roles = client.users.db.get_assigned_roles(user_id=randomUserName)
199+
user_id = _unique_user_id(request.node.name)
200+
client.users.db.create(user_id=user_id)
201+
roles = client.users.db.get_assigned_roles(user_id=user_id)
202202
assert len(roles) == 0
203-
client.users.db.delete(user_id=randomUserName)
203+
client.users.db.delete(user_id=user_id)
204204

205205

206206
def test_list_all_users(client_factory: ClientFactory) -> None:
@@ -226,16 +226,16 @@ def test_get_user_created_at_and_api_key_first_letters(
226226
if client._connection._weaviate_version.is_lower_than(1, 30, 0):
227227
pytest.skip("This test requires Weaviate 1.30.0 or higher")
228228

229-
randomUserName = _unique_user_id(request.node.name)
230-
client.users.db.create(user_id=randomUserName)
229+
user_id = _unique_user_id(request.node.name)
230+
client.users.db.create(user_id=user_id)
231231
try:
232-
user = client.users.db.get(user_id=randomUserName)
232+
user = client.users.db.get(user_id=user_id)
233233
assert user is not None
234234
assert user.created_at is not None
235235
assert user.api_key_first_letters is not None
236236
assert len(user.api_key_first_letters) > 0
237237
finally:
238-
client.users.db.delete(user_id=randomUserName)
238+
client.users.db.delete(user_id=user_id)
239239

240240

241241
def test_get_user_include_last_used_time(
@@ -245,28 +245,28 @@ def test_get_user_include_last_used_time(
245245
if client._connection._weaviate_version.is_lower_than(1, 30, 0):
246246
pytest.skip("This test requires Weaviate 1.30.0 or higher")
247247

248-
randomUserName = _unique_user_id(request.node.name)
249-
apiKey = client.users.db.create(user_id=randomUserName)
248+
user_id = _unique_user_id(request.node.name)
249+
api_key = client.users.db.create(user_id=user_id)
250250
try:
251251
# log in with the new user to generate a lastUsedAt timestamp
252252
with weaviate.connect_to_local(
253253
port=RBAC_PORTS[0],
254254
grpc_port=RBAC_PORTS[1],
255-
auth_credentials=Auth.api_key(apiKey),
255+
auth_credentials=Auth.api_key(api_key),
256256
) as client2:
257-
assert client2.users.get_my_user().user_id == randomUserName
257+
assert client2.users.get_my_user().user_id == user_id
258258

259259
# without include_last_used_time, last_used_time should be None
260-
user = client.users.db.get(user_id=randomUserName)
260+
user = client.users.db.get(user_id=user_id)
261261
assert user is not None
262262
assert user.last_used_time is None
263263

264264
# with include_last_used_time=True, last_used_time should be populated
265-
user = client.users.db.get(user_id=randomUserName, include_last_used_time=True)
265+
user = client.users.db.get(user_id=user_id, include_last_used_time=True)
266266
assert user is not None
267267
assert user.last_used_time is not None
268268
finally:
269-
client.users.db.delete(user_id=randomUserName)
269+
client.users.db.delete(user_id=user_id)
270270

271271

272272
def test_list_all_include_last_used_time(
@@ -276,29 +276,29 @@ def test_list_all_include_last_used_time(
276276
if client._connection._weaviate_version.is_lower_than(1, 30, 0):
277277
pytest.skip("This test requires Weaviate 1.30.0 or higher")
278278

279-
randomUserName = _unique_user_id(request.node.name)
280-
apiKey = client.users.db.create(user_id=randomUserName)
279+
user_id = _unique_user_id(request.node.name)
280+
api_key = client.users.db.create(user_id=user_id)
281281
try:
282282
# log in with the new user to generate a lastUsedAt timestamp
283283
with weaviate.connect_to_local(
284284
port=RBAC_PORTS[0],
285285
grpc_port=RBAC_PORTS[1],
286-
auth_credentials=Auth.api_key(apiKey),
286+
auth_credentials=Auth.api_key(api_key),
287287
) as client2:
288-
assert client2.users.get_my_user().user_id == randomUserName
288+
assert client2.users.get_my_user().user_id == user_id
289289

290290
# without include_last_used_time, last_used_time should be None
291291
users = client.users.db.list_all()
292-
target = next((u for u in users if u.user_id == randomUserName), None)
292+
target = next((u for u in users if u.user_id == user_id), None)
293293
assert target is not None
294294
assert target.created_at is not None
295295
assert target.api_key_first_letters is not None
296296
assert target.last_used_time is None
297297

298298
# with include_last_used_time=True, last_used_time should be populated
299299
users = client.users.db.list_all(include_last_used_time=True)
300-
target = next((u for u in users if u.user_id == randomUserName), None)
300+
target = next((u for u in users if u.user_id == user_id), None)
301301
assert target is not None
302302
assert target.last_used_time is not None
303303
finally:
304-
client.users.db.delete(user_id=randomUserName)
304+
client.users.db.delete(user_id=user_id)

0 commit comments

Comments
 (0)