Skip to content

Commit 65ec4a0

Browse files
committed
squash - just check the error code
1 parent 8c2c3a9 commit 65ec4a0

1 file changed

Lines changed: 8 additions & 25 deletions

File tree

test/test_endpoint_operations.py

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -226,28 +226,18 @@ def test_create(self):
226226

227227
# test invalid path
228228
response = collections.create(self.rodsadmin_session, f"{self.zone_name}/home/new")
229-
self.assertEqual(
230-
"{'irods_response': {'status_code': -358000, "
231-
"'status_message': 'path does not exist: OBJ_PATH_DOES_NOT_EXIST'}}",
232-
str(response["data"]),
233-
)
229+
self.assertEqual(response["data"]["irods_response"], -358000) # OBJ_PATH_DOES_NOT_EXIST
234230

235231
# test create_intermediates
236232
response = collections.create(
237233
self.rodsadmin_session, f"/{self.zone_name}/home/test/folder", create_intermediates=0
238234
)
239-
self.assertEqual(
240-
"{'irods_response': {'status_code': -358000, "
241-
"'status_message': 'path does not exist: OBJ_PATH_DOES_NOT_EXIST'}}",
242-
str(response["data"]),
243-
)
235+
self.assertEqual(response["data"]["irods_response"], -358000) # OBJ_PATH_DOES_NOT_EXIST
244236
response = collections.create(
245237
self.rodsadmin_session, f"/{self.zone_name}/home/test/folder", create_intermediates=1
246238
)
247-
self.assertEqual(
248-
"{'created': True, 'irods_response': {'status_code': 0}}",
249-
str(response["data"]),
250-
)
239+
self.assertEqual(response["data"]["irods_response"]["status_code"], 0)
240+
self.assertTrue(response["data"]["created"])
251241

252242
finally:
253243
# clean up test collections
@@ -317,19 +307,12 @@ def test_remove(self):
317307
response = collections.create(
318308
self.rodsadmin_session, f"/{self.zone_name}/home/test/folder", create_intermediates=1
319309
)
320-
self.assertEqual(
321-
"{'created': True, 'irods_response': {'status_code': 0}}",
322-
str(response["data"]),
323-
)
310+
self.assertEqual(response["data"]["irods_response"]["status_code"], 0)
311+
self.assertTrue(response["data"]["created"])
324312
response = collections.remove(self.rodsadmin_session, f"/{self.zone_name}/home/test", recurse=0)
325-
self.assertEqual(
326-
"{'irods_response': {'status_code': -79000, "
327-
"'status_message': 'cannot remove non-empty collection: "
328-
"SYS_COLLECTION_NOT_EMPTY'}}",
329-
str(response["data"]),
330-
)
313+
self.assertEqual(response["data"]["irods_response"]["status_code"], -79000) # SYS_COLLECTION_NOT_EMPTY
331314
response = collections.remove(self.rodsadmin_session, f"/{self.zone_name}/home/test", recurse=1)
332-
self.assertEqual("{'irods_response': {'status_code': 0}}", str(response["data"]))
315+
self.assertEqual(response["data"]["irods_response"]["status_code"], 0)
333316

334317
finally:
335318
# clean up test collections

0 commit comments

Comments
 (0)