admin/registry-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #118 from jylitalo/fix_tests

Browse Source 
Fix test.py to reflect --plain
This commit is contained in:
Ivan Pavlushin
2024-02-23 19:37:41 +01:00
committed by GitHub
parent efc61888ac 54b17d3ed7
commit fb02b47053
2 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
registry.py
View File

@@ -612,24 +612,24 @@ def delete_tags(
# registry.delete_tag_layer(image_name, layer_digest, dry_run) # registry.delete_tag_layer(image_name, layer_digest, dry_run)
def get_tags_like(args_tags_like, tags_list): def get_tags_like(args_tags_like, tags_list, plain):
result = set() result = set()
for tag_like in args_tags_like: for tag_like in args_tags_like:
if not args.plain: if not plain:
print("tag like: {0}".format(tag_like)) print("tag like: {0}".format(tag_like))
for tag in tags_list: for tag in tags_list:
if re.search(tag_like, tag): if re.search(tag_like, tag):
if not args.plain: if not plain:
print("Adding {0} to tags list".format(tag)) print("Adding {0} to tags list".format(tag))
result.add(tag) result.add(tag)
return result return result
def get_tags(all_tags_list, image_name, tags_like): def get_tags(all_tags_list, image_name, tags_like, plain):
# check if there are args for special tags # check if there are args for special tags
result = set() result = set()
if tags_like: if tags_like:
result = get_tags_like(tags_like, all_tags_list) result = get_tags_like(tags_like, all_tags_list, plain)
else: else:
result.update(all_tags_list) result.update(all_tags_list)
@@ -694,7 +694,7 @@ def get_newer_tags(registry, image_name, hours, tags_list):
return result return result
def get_datetime_tags(registry, image_name, tags_list): def get_datetime_tags(registry, image_name, tags_list, plain):
def newer(tag): def newer(tag):
image_config = registry.get_tag_config(image_name, tag) image_config = registry.get_tag_config(image_name, tag)
if image_config == []: if image_config == []:
@@ -709,7 +709,7 @@ def get_datetime_tags(registry, image_name, tags_list):
"datetime": parse(image_age).astimezone(tzutc()) "datetime": parse(image_age).astimezone(tzutc())
} }
if not args.plain: if not plain:
print('---------------------------------') print('---------------------------------')
p = ThreadPool(4) p = ThreadPool(4)
result = list(x for x in p.map(newer, tags_list) if x) result = list(x for x in p.map(newer, tags_list) if x)
@@ -810,7 +810,7 @@ def main_loop(args):
if args.order_by_date: if args.order_by_date:
tags_list = get_ordered_tags(registry, image_name, all_tags_list, args.order_by_date) tags_list = get_ordered_tags(registry, image_name, all_tags_list, args.order_by_date)
else: else:
tags_list = get_tags(all_tags_list, image_name, args.tags_like) tags_list = get_tags(all_tags_list, image_name, args.tags_like, args.plain)
# print(tags and optionally layers # print(tags and optionally layers
for tag in tags_list: for tag in tags_list:

42
test.py
View File

@@ -231,18 +231,18 @@ class TestListTags(unittest.TestCase):
def test_list_tags_like_various(self): def test_list_tags_like_various(self):
tags_list = set(['FINAL_0.1', 'SNAPSHOT_0.1', tags_list = set(['FINAL_0.1', 'SNAPSHOT_0.1',
"0.1.SNAP", "1.0.0_FINAL"]) "0.1.SNAP", "1.0.0_FINAL"])
self.assertEqual(get_tags(tags_list, "", set( for plain in [True, False]:
["FINAL"])), set(["FINAL_0.1", "1.0.0_FINAL"])) self.assertEqual(get_tags(tags_list, "", set(
self.assertEqual(get_tags(tags_list, "", set( ["FINAL"]), plain), set(["FINAL_0.1", "1.0.0_FINAL"]))
["SNAPSHOT"])), set(['SNAPSHOT_0.1'])) self.assertEqual(get_tags(tags_list, "", set(
self.assertEqual(get_tags(tags_list, "", set()), ["SNAPSHOT"]), plain), set(['SNAPSHOT_0.1']))
set(['FINAL_0.1', 'SNAPSHOT_0.1', "0.1.SNAP", "1.0.0_FINAL"])) self.assertEqual(get_tags(tags_list, "", set(), plain),
self.assertEqual(get_tags(tags_list, "", set(["ABSENT"])), set()) set(['FINAL_0.1', 'SNAPSHOT_0.1', "0.1.SNAP", "1.0.0_FINAL"]))
self.assertEqual(get_tags(tags_list, "", set(["ABSENT"]), plain), set())
self.assertEqual( self.assertEqual(
get_tags(tags_list, "IMAGE:TAG00", ""), set(["TAG00"])) get_tags(tags_list, "IMAGE:TAG00", "", plain), set(["TAG00"]))
self.assertEqual(get_tags(tags_list, "IMAGE:TAG00", set( self.assertEqual(get_tags(tags_list, "IMAGE:TAG00", set(
["WILL_NOT_BE_CONSIDERED"])), set(["TAG00"])) ["WILL_NOT_BE_CONSIDERED"]), plain), set(["TAG00"]))
class TestListDigest(unittest.TestCase): class TestListDigest(unittest.TestCase):
@@ -760,17 +760,19 @@ class TestGetDatetimeTags(unittest.TestCase):
self.registry.http.reset_return_value(200, "MOCK_DIGEST") self.registry.http.reset_return_value(200, "MOCK_DIGEST")
def test_get_datetime_tags(self): def test_get_datetime_tags(self):
self.assertEqual( for plain in [True, False]:
get_datetime_tags(self.registry, "imagename", ["latest"]), self.assertEqual(
[{"tag": "latest", "datetime": datetime(2017, 12, 27, 12, 47, 33, 511765, tzinfo=tzutc())}] get_datetime_tags(self.registry, "imagename", ["latest"], plain),
) [{"tag": "latest", "datetime": datetime(2017, 12, 27, 12, 47, 33, 511765, tzinfo=tzutc())}]
)
def test_get_non_utc_datetime_tags(self): def test_get_non_utc_datetime_tags(self):
self.registry.get_image_age.return_value = "2019-07-18T16:33:15.864962122+02:00" self.registry.get_image_age.return_value = "2019-07-18T16:33:15.864962122+02:00"
self.assertEqual( for plain in [True, False]:
get_datetime_tags(self.registry, "imagename", ["latest"]), self.assertEqual(
[{"tag": "latest", "datetime": datetime(2019, 7, 18, 16, 33, 15, 864962, tzinfo=tzoffset(None, 7200))}] get_datetime_tags(self.registry, "imagename", ["latest"], plain),
) [{"tag": "latest", "datetime": datetime(2019, 7, 18, 16, 33, 15, 864962, tzinfo=tzoffset(None, 7200))}]
)
class TestGetOrderedTags(unittest.TestCase): class TestGetOrderedTags(unittest.TestCase):