diff --git a/swh/web/common/converters.py b/swh/web/common/converters.py --- a/swh/web/common/converters.py +++ b/swh/web/common/converters.py @@ -200,8 +200,7 @@ """Convert from an SWH origin to an origin dictionary. """ - return from_swh(origin, - removables_if_empty={'lister', 'project'}) + return from_swh(origin) def from_release(release): diff --git a/swh/web/tests/api/views/test_origin.py b/swh/web/tests/api/views/test_origin.py --- a/swh/web/tests/api/views/test_origin.py +++ b/swh/web/tests/api/views/test_origin.py @@ -25,8 +25,6 @@ self.origin1 = { 'id': 1234, - 'lister': 'uuid-lister-0', - 'project': 'uuid-project-0', 'url': 'ftp://some/url/to/origin/0', 'type': 'ftp' } diff --git a/swh/web/tests/common/test_converters.py b/swh/web/tests/common/test_converters.py --- a/swh/web/tests/common/test_converters.py +++ b/swh/web/tests/common/test_converters.py @@ -211,8 +211,6 @@ 'id': 9, 'type': 'ftp', 'url': 'rsync://ftp.gnu.org/gnu/octave', - 'project': None, - 'lister': None, } expected_origin = { diff --git a/swh/web/tests/common/test_service.py b/swh/web/tests/common/test_service.py --- a/swh/web/tests/common/test_service.py +++ b/swh/web/tests/common/test_service.py @@ -700,8 +700,6 @@ # given mock_storage.origin_get = MagicMock(return_value={ 'id': 'origin-id', - 'lister': 'uuid-lister', - 'project': 'uuid-project', 'url': 'ftp://some/url/to/origin', 'type': 'ftp'}) @@ -710,8 +708,6 @@ # then self.assertEqual(actual_origin, {'id': 'origin-id', - 'lister': 'uuid-lister', - 'project': 'uuid-project', 'url': 'ftp://some/url/to/origin', 'type': 'ftp'})