Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add job_run_as_user to integ test #57

Merged
merged 1 commit into from
Oct 13, 2023
Merged
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
22 changes: 8 additions & 14 deletions test/integ/test_job_submissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
Farm,
Fleet,
Job,
PosixUser,
JobRunAsUser,
PosixSessionUser,
Queue,
QueueFleetAssociation,
TaskStatus,
Expand All @@ -48,8 +49,8 @@ def fleet(deadline_resources: DeadlineResources) -> Fleet:


@pytest.fixture(scope="session")
def job_run_as_user() -> PosixUser:
return PosixUser(
def job_run_as_user() -> PosixSessionUser:
return PosixSessionUser(
user="job-run-as-user",
group="job-run-as-user-group",
)
Expand All @@ -58,7 +59,7 @@ def job_run_as_user() -> PosixUser:
@pytest.fixture(scope="session")
def worker_config(
worker_config: DeadlineWorkerConfiguration,
job_run_as_user: PosixUser,
job_run_as_user: PosixSessionUser,
) -> DeadlineWorkerConfiguration:
return dataclasses.replace(
worker_config,
Expand All @@ -74,20 +75,13 @@ def queue_with_job_run_as_user(
farm: Farm,
fleet: Fleet,
deadline_client: DeadlineClient,
job_run_as_user: PosixUser,
job_run_as_user: PosixSessionUser,
) -> Generator[Queue, None, None]:
queue = Queue.create(
client=deadline_client,
display_name=f"Queue with jobsRunAsUser {job_run_as_user.user}",
farm=farm,
raw_kwargs={
"jobRunAsUser": {
"posix": {
"user": job_run_as_user.user,
"group": job_run_as_user.group,
},
},
},
job_run_as_user=JobRunAsUser(posix=job_run_as_user),
)

qfa = QueueFleetAssociation.create(
Expand Down Expand Up @@ -144,7 +138,7 @@ def test_jobs_run_as_user(
deadline_client: DeadlineClient,
farm: Farm,
queue_with_job_run_as_user: Queue,
job_run_as_user: PosixUser,
job_run_as_user: PosixSessionUser,
) -> None:
# WHEN
job = Job.submit(
Expand Down