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.

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

142 fix diag test #143

Merged
merged 2 commits into from
Aug 17, 2017
Merged

142 fix diag test #143

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
e26ee25
Reduce Baltic diagnostic max outputs within limits. #142
Aug 14, 2017
b65e244
Diagnostic test requires clean diag_table to start. Closes #142
Aug 14, 2017
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
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/Baltic/input.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
max_output_fields=2000
max_input_fields=2000
max_num_axis_sets=2000
max_files=2000
max_files=1024
max_axes=4000
/

Expand Down
13 changes: 5 additions & 8 deletions tools/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import os

import pytest
import subprocess as sp
from dump_all_diagnostics import dump_diags
from experiment import create_experiments, exp_id_from_path

Expand Down Expand Up @@ -47,6 +48,10 @@ def exp(request):
"""
exp = request.param

# Make sure that the experiment has the original diag_table
diag_table = os.path.join(exp.path, 'diag_table')
sp.check_call(['git', 'checkout', diag_table])

# Run the experiment to get latest code changes, and updates to the
# available_diags. This will do nothing if the experiment has already been
# run.
Expand Down Expand Up @@ -80,14 +85,6 @@ def exp_diags_not_dumped():
return exp


def restore_after_test():
"""
Restore experiment state after running a test.

- The diag_table files needs to be switched back (?)
"""
pass

@pytest.fixture(scope='module')
def prepare_to_test():
"""
Expand Down