Skip to content

Commit

Permalink
Cherry pick #4610 (#4623)
Browse files Browse the repository at this point in the history
Don't force users to sign trusted agreement.
Also, fix failing unittest.
  • Loading branch information
jonathanmetzman authored Jan 21, 2025
1 parent e6ebf00 commit 7e76a34
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/appengine/handlers/upload_testcase.py
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,9 @@ def do_post(self):
trusted_agreement_signed = request.get(
'trustedAgreement') == TRUSTED_AGREEMENT_TEXT.strip()

if (not trusted_agreement_signed and
# Chrome is the only ClusterFuzz deployment where there are trusted bots running utasks.
# This check also fails on oss-fuzz because of the way it abuses platform.
if (not trusted_agreement_signed and utils.is_chromium() and
task_utils.is_remotely_executing_utasks() and
((platform_id and platform_id != 'Linux') or
job.platform.lower() != 'linux')):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ def test_execute(self):
'SUMMARY_PREFIX = lib1\n'
'MANAGED = True\n'
'DISK_SIZE_GB = 500\n'
'ALLOW_UNPACK_OVER_HTTP = True\n'
'REVISION_VARS_URL = https://commondatastorage.googleapis.com/'
'clusterfuzz-builds/lib1/lib1-address-%s.srcmap.json\n'
'FUZZ_LOGS_BUCKET = lib1-logs.clusterfuzz-external.appspot.com\n'
Expand Down Expand Up @@ -462,6 +463,7 @@ def test_execute(self):
'SUMMARY_PREFIX = lib1\n'
'MANAGED = True\n'
'DISK_SIZE_GB = 500\n'
'ALLOW_UNPACK_OVER_HTTP = True\n'
'REVISION_VARS_URL = https://commondatastorage.googleapis.com/'
'clusterfuzz-builds-afl/lib1/lib1-address-%s.srcmap.json\n'
'FUZZ_LOGS_BUCKET = lib1-logs.clusterfuzz-external.appspot.com\n'
Expand Down

0 comments on commit 7e76a34

Please sign in to comment.