Skip to content

Commit 200c2cd

Browse files
committed
test: enable tests for errors for image
1 parent 0fe6d90 commit 200c2cd

1 file changed

Lines changed: 7 additions & 13 deletions

File tree

tests/test_draw.py

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -380,24 +380,18 @@ def test_drawImage():
380380
os.path.join(os.path.dirname(__file__), 'fits_files/tpv.fits')))
381381

382382
assert_raises(ValueError, obj.drawImage, bounds=galsim.BoundsI())
383-
if is_jax_galsim():
384-
pass
385-
else:
386-
assert_raises(ValueError, obj.drawImage, image=im10, gain=0.)
387-
assert_raises(ValueError, obj.drawImage, image=im10, gain=-1.)
388-
assert_raises(ValueError, obj.drawImage, image=im10, area=0.)
389-
assert_raises(ValueError, obj.drawImage, image=im10, area=-1.)
390-
assert_raises(ValueError, obj.drawImage, image=im10, exptime=0.)
391-
assert_raises(ValueError, obj.drawImage, image=im10, exptime=-1.)
383+
assert_raises((ValueError, Exception), obj.drawImage, image=im10, gain=0.)
384+
assert_raises((ValueError, Exception), obj.drawImage, image=im10, gain=-1.)
385+
assert_raises((ValueError, Exception), obj.drawImage, image=im10, area=0.)
386+
assert_raises((ValueError, Exception), obj.drawImage, image=im10, area=-1.)
387+
assert_raises((ValueError, Exception), obj.drawImage, image=im10, exptime=0.)
388+
assert_raises((ValueError, Exception), obj.drawImage, image=im10, exptime=-1.)
392389
assert_raises(ValueError, obj.drawImage, image=im10, method='invalid')
393390

394391
# These options are invalid unless metho=phot
395392
assert_raises(TypeError, obj.drawImage, image=im10, n_photons=3)
396393
assert_raises(TypeError, obj.drawImage, rng=galsim.BaseDeviate(234))
397-
if is_jax_galsim():
398-
pass
399-
else:
400-
assert_raises(TypeError, obj.drawImage, max_extra_noise=23)
394+
assert_raises(ValueError, obj.drawImage, max_extra_noise=23)
401395
assert_raises(TypeError, obj.drawImage, poisson_flux=True)
402396
assert_raises(TypeError, obj.drawImage, maxN=10000)
403397
assert_raises(TypeError, obj.drawImage, save_photons=True)

0 commit comments

Comments
 (0)