Skip to content

Commit

Permalink
Include LocalDriver in generic driver tests
Browse files Browse the repository at this point in the history
  • Loading branch information
berland committed Mar 13, 2024
1 parent 22ce428 commit cb90b19
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions tests/integration_tests/scheduler/test_generic_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@

import pytest

from ert.scheduler.local_driver import LocalDriver
from ert.scheduler.lsf_driver import LsfDriver
from ert.scheduler.openpbs_driver import OpenPBSDriver
from tests.utils import poll

from .conftest import mock_bin


@pytest.fixture(params=[LsfDriver, OpenPBSDriver])
@pytest.fixture(params=[LocalDriver, LsfDriver, OpenPBSDriver])
def driver(request, pytestconfig, monkeypatch, tmp_path):
class_ = request.param
queue_name = None
Expand Down Expand Up @@ -39,6 +40,8 @@ def driver(request, pytestconfig, monkeypatch, tmp_path):
else:
mock_bin(monkeypatch, tmp_path)

if class_ is LocalDriver:
return class_()
return class_(queue_name=queue_name)


Expand Down Expand Up @@ -80,6 +83,9 @@ async def test_kill(driver):
if isinstance(driver, OpenPBSDriver):
expected_returncode = 256 + signal.SIGTERM

if isinstance(driver, LocalDriver):
expected_returncode = -signal.SIGTERM

async def started(iens):
nonlocal driver
await driver.kill(iens)
Expand All @@ -92,6 +98,6 @@ async def finished(iens, returncode, aborted):
nonlocal aborted_called
aborted_called = True

await driver.submit(0, "sleep 3; exit 2")
await driver.submit(0, "sh", "-c", "sleep 3; exit 2")
await poll(driver, {0}, started=started, finished=finished)
assert aborted_called

0 comments on commit cb90b19

Please sign in to comment.