diff options
| author | Nadia Dencheva <nadia.astropy@gmail.com> | 2016-12-18 15:59:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-18 15:59:55 -0500 |
| commit | bec6e16c25ee829566955c4ff128a32e591b920e (patch) | |
| tree | 60d597dfa81fb5dc8ae722f00531a2152894414e /stwcs/tests/test_headerlet.py | |
| parent | dc6eaa10f996af4173cebdd85f7a53d113272529 (diff) | |
| parent | 0bd69fca03ec01f8b51bdf50531c19fcfeaa9be1 (diff) | |
| download | stwcs_hcf-bec6e16c25ee829566955c4ff128a32e591b920e.tar.gz | |
Merge pull request #22 from nden/improve-logic
Improve logic
Diffstat (limited to 'stwcs/tests/test_headerlet.py')
| -rw-r--r-- | stwcs/tests/test_headerlet.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/stwcs/tests/test_headerlet.py b/stwcs/tests/test_headerlet.py index f4fa050..ab250a8 100644 --- a/stwcs/tests/test_headerlet.py +++ b/stwcs/tests/test_headerlet.py @@ -8,7 +8,7 @@ from ..wcsutil import headerlet, wcsdiff from ..wcsutil import HSTWCS import numpy as np from numpy.testing import utils -from nose.tools import * +import pytest from . import data data_path = os.path.split(os.path.abspath(data.__file__))[0] @@ -100,7 +100,6 @@ class TestCreateHeaderlet(object): assert(wcsdiff.is_wcs_identical(self.simple_file, self.headerlet_name, [0], [1], verbose=True)[0]) - @raises(KeyError) def test_no_HDRNAME_no_WCSNAME(self): """ Test create_headerlet stepping through all @@ -108,9 +107,10 @@ class TestCreateHeaderlet(object): """ newf = get_filepath('ncomp.fits', os.path.abspath(os.path.curdir)) shutil.copyfile(self.comp_file, newf) - fits.delval(newf, 'HDRNAME', ext=1) + #fits.delval(newf, 'HDRNAME', ext=1) fits.delval(newf, 'WCSNAME', ext=1) - hlet = headerlet.create_headerlet(newf) + with pytest.raises(KeyError): + hlet = headerlet.create_headerlet(newf) def test1SciExt(self): """ @@ -176,23 +176,24 @@ class TestApplyHeaderlet: hlet.apply_as_primary('comp.fits') """ - @raises(ValueError) + def testWrongSIPModel(self): hlet = headerlet.create_headerlet(self.comp_file, hdrname='test1', sipname='WRONG') - hlet.apply_as_primary(self.comp_file) + with pytest.raises(ValueError): + hlet.apply_as_primary(self.comp_file) - @raises(ValueError) def testWrongNPOLModel(self): hlet = headerlet.create_headerlet(self.comp_file, hdrname='test1', npolfile='WRONG') - hlet.apply_as_primary(self.comp_file) + with pytest.raises(ValueError): + hlet.apply_as_primary(self.comp_file) - @raises(ValueError) def testWrongD2IMModel(self): hlet = headerlet.create_headerlet(self.comp_file, hdrname='test1', d2imfile='WRONG') - hlet.apply_as_primary(self.comp_file) + with pytest.raises(ValueError): + hlet.apply_as_primary(self.comp_file) def test_apply_as_primary_method(self): hlet = headerlet.create_headerlet(self.comp_file, hdrname='test2') |