From ec82dd0042c75b4a7a7be19ef68725028ca05240 Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: Feb 11 2020 10:29:47 +0000 Subject: Fix converting Subject to string and repr Signed-off-by: Lukas Holecek --- diff --git a/greenwave/subjects/subject.py b/greenwave/subjects/subject.py index d4dfd3a..1e3d535 100644 --- a/greenwave/subjects/subject.py +++ b/greenwave/subjects/subject.py @@ -129,5 +129,10 @@ class Subject: def __str__(self): return "subject_type {!r}, subject_identifier {!r}".format( - self.type_, self.item + self.type, self.item + ) + + def __repr__(self): + return "Subject({!r}, {!r})".format( + self._type, self.item ) diff --git a/greenwave/subjects/subject_type.py b/greenwave/subjects/subject_type.py index f4bc50e..463d796 100644 --- a/greenwave/subjects/subject_type.py +++ b/greenwave/subjects/subject_type.py @@ -62,6 +62,9 @@ class SubjectType(SafeYAMLObject): def safe_yaml_label(self): return 'SubjectType {!r}'.format(self.id) + def __repr__(self): + return ''.format(self.id) + class GenericSubjectType: def __init__(self, id_): diff --git a/greenwave/tests/test_subjects.py b/greenwave/tests/test_subjects.py index ac3d10e..18ade3c 100644 --- a/greenwave/tests/test_subjects.py +++ b/greenwave/tests/test_subjects.py @@ -92,3 +92,13 @@ def test_subject_get_latest_results(app): 'system_architecture': ['x86_64'], } assert subject.get_latest_results(results)[1]['outcome'] == 'PASSED' + + +def test_subject_to_str(app): + subject = create_subject('koji_build', 'some_nvr') + assert str(subject) == "subject_type 'koji_build', subject_identifier 'some_nvr'" + + +def test_subject_to_repr(app): + subject = create_subject('koji_build', 'some_nvr') + assert repr(subject) == "Subject(, 'some_nvr')"