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
8 changes: 4 additions & 4 deletions test/async_client_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ async def test_async_sandboxtask_submit(self, uid):
instance, _ = await submit_and_scan(api, uid, wait=False)
task = await _dispatch_sandbox(api, instance.id, 'cape', 'win-10-build-19041', True)
assert task.json['config']['network_enabled'] is True
task = await _dispatch_sandbox(api, instance.id, 'triage', 'win10-build-15063', False)
task = await _dispatch_sandbox(api, instance.id, 'triage', 'windows11-21h2-x64', False)
assert task.sandbox == 'triage'
assert task.json['config']['network_enabled'] is False

Expand All @@ -446,7 +446,7 @@ async def test_async_sandboxtask_latest(self, uid):
async with self._api() as api:
instance, sha = await submit_and_scan(api, uid, wait=False)
cape = await _dispatch_sandbox(api, instance.id, 'cape', 'win-10-build-19041', True)
triage = await _dispatch_sandbox(api, instance.id, 'triage', 'win10-build-15063', False)
triage = await _dispatch_sandbox(api, instance.id, 'triage', 'windows11-21h2-x64', False)

# No cape/triage VMs in e2e — drive each task to SUCCEEDED by replaying
# the sandbox worker's HTTP calls. Completing a task creates its
Expand All @@ -472,7 +472,7 @@ async def test_async_sandboxtask_list(self, uid):
# Dispatch cape + triage concurrently (distinct sandbox slugs, independent).
await run_concurrently_async([
_dispatch_sandbox(api, instance.id, 'cape', 'win-10-build-19041', True),
_dispatch_sandbox(api, instance.id, 'triage', 'win10-build-15063', False),
_dispatch_sandbox(api, instance.id, 'triage', 'windows11-21h2-x64', False),
])

# Poll until the SandboxTaskSearchHash index sees both tasks.
Expand Down Expand Up @@ -506,7 +506,7 @@ async def test_async_sample(self, uid):
async with self._api() as api:
instance, sha = await submit_and_scan(api, uid, wait=False)
cape = await _dispatch_sandbox(api, instance.id, 'cape', 'win-10-build-19041', True)
triage = await _dispatch_sandbox(api, instance.id, 'triage', 'win10-build-15063', False)
triage = await _dispatch_sandbox(api, instance.id, 'triage', 'windows11-21h2-x64', False)
await _complete_sandbox_task(cape.id, 'cape')
await _complete_sandbox_task(triage.id, 'triage')

Expand Down
8 changes: 4 additions & 4 deletions test/client_scan_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ def test_sandboxtask_submit(self):

task = _dispatch_sandbox(v3api, instance.id, 'cape', 'win-10-build-19041', True)
assert task.json['config']['network_enabled'] is True
task = _dispatch_sandbox(v3api, instance.id, 'triage', 'win10-build-15063', False)
task = _dispatch_sandbox(v3api, instance.id, 'triage', 'windows11-21h2-x64', False)
assert task.sandbox == 'triage'
assert task.json['config']['network_enabled'] is False

Expand All @@ -815,7 +815,7 @@ def test_sandboxtask_latest(self):
# is what sandbox_task_latest reads.
instance, sha256 = submit_and_scan(v3api, self._testMethodName, wait=False)
cape = _dispatch_sandbox(v3api, instance.id, 'cape', 'win-10-build-19041', True)
triage = _dispatch_sandbox(v3api, instance.id, 'triage', 'win10-build-15063', False)
triage = _dispatch_sandbox(v3api, instance.id, 'triage', 'windows11-21h2-x64', False)

# _complete_sandbox_task waits (event-driven) for the sandbox service to
# register each just-dispatched task before driving it to SUCCEEDED.
Expand All @@ -839,7 +839,7 @@ def test_sandboxtask_list(self):
# Dispatch cape + triage concurrently (distinct sandbox slugs, independent).
run_concurrently([
lambda: _dispatch_sandbox(v3api, instance.id, 'cape', 'win-10-build-19041', True),
lambda: _dispatch_sandbox(v3api, instance.id, 'triage', 'win10-build-15063', False),
lambda: _dispatch_sandbox(v3api, instance.id, 'triage', 'windows11-21h2-x64', False),
])

# Poll until the SandboxTaskSearchHash index sees both tasks.
Expand Down Expand Up @@ -876,7 +876,7 @@ def test_sample(self):
uid = self._testMethodName
instance, sha = submit_and_scan(api, uid, wait=False)
cape = _dispatch_sandbox(api, instance.id, 'cape', 'win-10-build-19041', True)
triage = _dispatch_sandbox(api, instance.id, 'triage', 'win10-build-15063', False)
triage = _dispatch_sandbox(api, instance.id, 'triage', 'windows11-21h2-x64', False)
_complete_sandbox_task(cape.id, 'cape')
_complete_sandbox_task(triage.id, 'triage')

Expand Down
Loading