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

Stop skipping multi-sweep masking tests #1216

Merged
merged 4 commits into from
May 28, 2020
Merged

Conversation

benjaminhwilliams
Copy link
Member

Some tests exist for masking multi-sweep data but they have been marked as skipped in the absence of test data in dials/data. Now that those data exist, we can enable the tests.

Also move from dxtbx.serialize.load to dxtbx.ExperimentList.from_file.

I suspect my somewhat imperfect pytest-fu means I've created a rather cumbersome parametrised fixture here — I might benefit from someone else's eyes on this in particular.

In short, before:

$ pytest --regression -k test_generate_mask
...
 test/command_line/test_generate_mask.py ✓s✓s✓s✓s✓s✓s✓s✓s✓✓s           100% ██████████
============================== short test summary info ===============================
SKIPPED [9] test/command_line/test_generate_mask.py: test depends on https://github.com/dials/data/pull/40

Results (5.18s):
      10 passed
       9 skipped
    1050 deselected

After:

$ pytest --regression -k test_generate_mask
...
 test/command_line/test_generate_mask.py ✓✓✓✓✓✓✓✓✓✓✓✓✓✓✓✓✓✓✓           100% ██████████

Results (8.06s):
      19 passed
    1050 deselected

Some tests exist for masking multi-sweep data but they have been marked
as skipped in the absence of test data in dials/data.  Now that those
data exist, we can enable the tests.

Also move from dxtbx.serialize.load to dxtbx.ExperimentList.from_file.
@benjaminhwilliams benjaminhwilliams added the dials.generate_mask Issues relating to dials.generate_mask label Apr 1, 2020
@benjaminhwilliams benjaminhwilliams self-assigned this Apr 1, 2020
@benjaminhwilliams
Copy link
Member Author

Sorry, branched before a commit on master that presumably fixed the failing cosym test. Hopefully a merge commit will make green ticks happen...

@benjaminhwilliams benjaminhwilliams removed the request for review from rjgildea May 28, 2020 10:19
@benjaminhwilliams benjaminhwilliams merged commit 878feb2 into master May 28, 2020
@benjaminhwilliams benjaminhwilliams deleted the more-masking-tests branch May 28, 2020 10:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dials.generate_mask Issues relating to dials.generate_mask
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants