Skip to content

Commit ff2c8df

Browse files
committed
fix tests
1 parent 93dae32 commit ff2c8df

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

irods/test/data_obj_test.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,10 +1251,12 @@ def test_replica_number(self):
12511251
# refresh object
12521252
obj = session.data_objects.get(obj_path)
12531253

1254-
# assertions on replicas
1254+
# assertions on replicas
12551255
self.assertEqual(len(obj.replicas), number_of_replicas)
1256-
for i, replica in enumerate(obj.replicas):
1257-
self.assertEqual(replica.number, i)
1256+
self.assertEqual(
1257+
{repl.number for repl in obj.replicas},
1258+
{*range(len(obj.replicas))}
1259+
)
12581260

12591261
# now trim odd-numbered replicas
12601262
# note (see irods/irods#4861): COPIES_KW might disappear in the future
@@ -1267,10 +1269,7 @@ def test_replica_number(self):
12671269
obj = session.data_objects.get(obj_path)
12681270

12691271
# check remaining replica numbers
1270-
replica_numbers = []
1271-
for replica in obj.replicas:
1272-
replica_numbers.append(replica.number)
1273-
self.assertEqual(replica_numbers, [0, 2, 4, 6])
1272+
self.assertEqual({r.number for r in obj.replicas}, {0, 2, 4, 6})
12741273

12751274
# remove object
12761275
obj.unlink(force=True)
@@ -1728,11 +1727,12 @@ def test_get_data_objects(self):
17281727
self.assertIsNotNone(obj.replicas[1].__getattribute__(i))
17291728

17301729
# ensure replica info is sensible
1730+
replicas = sorted(obj.replicas, key=lambda repl: repl.number)
17311731
for i in range(2):
1732-
self.assertEqual(obj.replicas[i].number, i)
1733-
self.assertEqual(obj.replicas[i].status, "1")
1734-
self.assertEqual(obj.replicas[i].path.split("/")[-1], filename)
1735-
self.assertEqual(obj.replicas[i].resc_hier.split(";")[-1], ufs_resources[i].name)
1732+
self.assertEqual(replicas[i].number, i)
1733+
self.assertEqual(replicas[i].status, "1")
1734+
self.assertEqual(replicas[i].path.split("/")[-1], filename)
1735+
self.assertEqual(replicas[i].resc_hier.split(";")[-1], ufs_resources[i].name)
17361736

17371737
self.assertEqual(obj.replicas[0].resource_name, ufs_resources[0].name)
17381738
if self.sess.server_version < (4, 2, 0):

0 commit comments

Comments
 (0)