Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions fossology/obj.py
Original file line number Diff line number Diff line change
Expand Up @@ -426,9 +426,9 @@ def __init__(
self.description = description
self.uploadname = uploadname
self.uploaddate = uploaddate
self.assignee = (assignee,)
self.assigneeDate = (assigneeDate,)
self.closeDate = (closingDate,)
self.assignee = assignee
self.assigneeDate = assigneeDate
self.closeDate = closingDate
self.hash = Hash.from_json(hash)
self.additional_info = kwargs

Expand Down
34 changes: 34 additions & 0 deletions tests/test_uploads.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,40 @@
from fossology.obj import Folder, Upload


def test_upload_assignee_fields_are_not_wrapped_in_tuples():
upload = Upload(
folderid=1,
foldername="root",
id=42,
description="",
uploadname="example.tar.gz",
uploaddate="2024-01-01",
assignee="alice",
assigneeDate="2024-01-02",
closingDate="2024-01-03",
hash={"sha1": "", "md5": "", "sha256": "", "size": 0},
)
assert upload.assignee == "alice"
assert upload.assigneeDate == "2024-01-02"
assert upload.closeDate == "2024-01-03"

unassigned = Upload(
folderid=1,
foldername="root",
id=43,
description="",
uploadname="example.tar.gz",
uploaddate="2024-01-01",
hash={"sha1": "", "md5": "", "sha256": "", "size": 0},
)
assert unassigned.assignee is None
assert not unassigned.assignee
Comment thread
Valyrian-Code marked this conversation as resolved.
assert unassigned.assigneeDate is None
assert not unassigned.assigneeDate
assert unassigned.closeDate is None
assert not unassigned.closeDate


def test_upload_sha1(upload: Upload):
assert upload.uploadname == "base-files_11.tar.xz"
assert upload.hash.sha1 == "D4D663FC2877084362FB2297337BE05684869B00"
Expand Down