Merge pull request #8818 from OpenMined/aziz/fix_job_tests

enable job tests in integration tests

tests/integration/local/job_test.py

@@ -2,7 +2,6 @@
 
 # stdlib
 from secrets import token_hex
-import time
 
 # third party
 import pytest
@@ -24,6 +23,7 @@ def test_job_restart(job) -> None:
  assert wait_until(
  lambda: job.fetched_status == JobStatus.PROCESSING
  ), "Job not started"
+ assert wait_until(lambda: len(job.subjobs) == 2), "Subjobs not started"
  assert wait_until(
  lambda: all(
  subjob.fetched_status == JobStatus.PROCESSING for subjob in job.subjobs
@@ -59,6 +59,10 @@ def test_job_restart(job) -> None:
  == 2
  ), "Subjobs not restarted"
 
+ result = job.kill()
+ assert isinstance(result, SyftSuccess), "Should kill job"
+ assert job.fetched_status == JobStatus.INTERRUPTED
+
 
 @pytest.fixture
 def node():
@@ -87,6 +91,7 @@ def job(node):
  @syft_function()
  def process_batch():
  # stdlib
+ import time # noqa: F811
 
  while time.sleep(1) is None:
  ...
@@ -96,6 +101,7 @@ def process_batch():
  @syft_function_single_use()
  def process_all(domain):
  # stdlib
+ import time # noqa: F811
 
  _ = domain.launch_job(process_batch)
  _ = domain.launch_job(process_batch)

tox.ini

@@ -477,7 +477,7 @@ allowlist_externals =
 setenv =
  PYTEST_MODULES = {env:PYTEST_MODULES:local_node}
  ASSOCIATION_REQUEST_AUTO_APPROVAL = {env:ASSOCIATION_REQUEST_AUTO_APPROVAL:true}
- PYTEST_FLAGS = {env:PYTEST_FLAGS:--ignore=tests/integration/local/gateway_local_test.py --ignore=tests/integration/local/job_test.py}
+ PYTEST_FLAGS = {env:PYTEST_FLAGS:--ignore=tests/integration/local/gateway_local_test.py}
 commands =
  python -c 'import syft as sy; sy.stage_protocol_changes()'
 
@@ -486,7 +486,7 @@ commands =
  PYTEST_MODULES=($PYTEST_MODULES); \
  for i in "${PYTEST_MODULES[@]}"; do \
  echo "Starting test for $i"; date; \
- pytest tests/integration -m $i -vvvv -p no:randomly -p no:benchmark -o log_cli=True --capture=no $PYTEST_FLAGS; \
+ pytest tests/integration -n auto -m $i -vvvv -p no:randomly -p no:benchmark -o log_cli=True --capture=no $PYTEST_FLAGS; \
  return=$?; \
  echo "Finished $i"; \
  date; \