Skip to content

okoenig/fix tests #24

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Aug 15, 2022
Merged

okoenig/fix tests #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
014ce79
Fix some tests
ojkoenig Aug 15, 2022
66c2138
Fix tests
ojkoenig Aug 15, 2022
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
0 tests/jms/test_configurations.py → tests/jms/test_job_definitions.py
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions tests/jms/test_design_points.py → tests/jms/test_jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,21 +222,21 @@ def test_job_update(self):
jobs = project.get_jobs(fields=["id", "eval_status"])
for job in jobs:
job.eval_status = "pending"
jobs = project.update_design_points(jobs)
jobs = project.update_jobs(jobs)

for job in jobs:
for p_name in input_parameters:
self.assertEqual(job.values[p_name], ref_values[job.id][p_name])

# change eval status with partial DP object including config id
jobs = project.get_design_points(fields=["id", "job_definition_id", "eval_status"])
for dp in dps:
dp.eval_status = "pending"
dps = project.update_design_points(dps)
jobs = project.get_jobs(fields=["id", "job_definition_id", "eval_status"])
for job in jobs:
job.eval_status = "pending"
jobs = project.update_jobs(jobs)

for dp in dps:
for job in jobs:
for p_name in input_parameters:
self.assertEqual(dp.values[p_name], ref_values[dp.id][p_name], p_name)
self.assertEqual(job.values[p_name], ref_values[job.id][p_name], p_name)

client.delete_project(project)

Expand Down
8 changes: 4 additions & 4 deletions tests/jms/test_task_files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def test_task_files_in_single_task_definition_project(self):
# Overwrite modified mac file per task
files.append(
File(
name="mac",
name="inp",
evaluation_path="motorbike_frame.mac",
type="text/plain",
src=mac_fpath,
Expand All @@ -77,7 +77,7 @@ def test_task_files_in_single_task_definition_project(self):
f.write(f"task_var='{t.id}'")
files.append(
File(
name="mac2",
name="inp2",
evaluation_path="task_input_file.mac",
type="text/plain",
src=mac2_fpath,
Expand All @@ -98,7 +98,7 @@ def test_task_files_in_single_task_definition_project(self):
file_ids = {f.name: f.id for f in files}
log.info(f"Add files: {file_ids}")

t.input_file_ids = [file_ids["mac"], file_ids["mac2"]]
t.input_file_ids = [file_ids["inp"], file_ids["inp2"]]
t.output_file_ids.append(file_ids["task_result"])
# Not yet supported: t.eval_status = 'pending'

Expand Down Expand Up @@ -160,7 +160,7 @@ def check_evaluated_tasks(proj, tasks):
self.assertEqual(len(set(t.input_file_ids).intersection(t.owned_file_ids)), 2)
input_files = proj.get_files(id=t.input_file_ids)
self.assertEqual(
set([f.name for f in input_files]), set(["mac", "mac2"])
set([f.name for f in input_files]), set(["inp", "inp2"])
) # Check input file names

owned_output_file_ids = set(t.output_file_ids).intersection(t.owned_file_ids)
Expand Down