Fix tests

Author: pllim

tests/test_ramp_fitting.py

@@ -1446,10 +1446,7 @@ def test_new_saturation(algo):
         check = np.array([[2.794573, 2.793989, np.nan]])
     np.testing.assert_allclose(sdata, check, tol, tol)
 
-    if algo == DEFAULT_OLS:
-        check = np.array([[JUMP | SAT, JUMP | SAT, DNU | SAT]])
-    else:  # LIKELY
-        check = np.array([[JUMP | SAT, JUMP | DNU | SAT, DNU | SAT]])
+    check = np.array([[JUMP | SAT, JUMP | SAT, DNU | SAT]])
     np.testing.assert_equal(sdq, check)
 
     if algo == DEFAULT_OLS:
@@ -1566,10 +1563,7 @@ def test_invalid_integrations(algo):
         check = np.array([[5576.588]])
     np.testing.assert_allclose(sdata, check, tol, tol)
 
-    if algo == DEFAULT_OLS:
-        check = np.array([[JUMP | SAT]])
-    else:  # LIKELY
-        check = np.array([[JUMP | SAT | DNU]])
+    check = np.array([[JUMP | SAT]])
     np.testing.assert_equal(sdq, check)
 
     if algo == DEFAULT_OLS:

tests/test_saturation.py

@@ -4,7 +4,7 @@
 
 """
 from enum import IntEnum
-import pytest
+
 import numpy as np
 
 from stcal.saturation.saturation import flag_saturated_pixels
@@ -40,7 +40,6 @@ def test_basic_saturation_flagging():
     assert np.all(gdq[0, satindex:, 5, 5] == DQFLAGS["SATURATED"])
 
 
-@pytest.mark.xfail(reason="stcal PR#321 broke this test")
 def test_read_pattern_saturation_flagging():
     """Check that the saturation threshold varies depending on how the reads
     are allocated into resultants."""
@@ -76,7 +75,7 @@ def test_read_pattern_saturation_flagging():
     )
 
     # Make sure that groups after the third get flagged
-    assert np.all(gdq[0, 2:, 5, 5] == DQFLAGS["SATURATED"])
+    assert np.all(gdq[0, 3:, 5, 5] == DQFLAGS["SATURATED"])
 
 
 def test_read_pattern_saturation_flagging_dnu():
@@ -120,7 +119,7 @@ def test_read_pattern_saturation_flagging_dnu():
 
 def test_group2_saturation_flagging_with_bias():
     """Flag group 2 saturation in frame-averaged data with significant bias.
-    
+
     Saturation in frame-averaged groups may not exceed the saturation threshold
     until after the group where a saturating CR occurs.  Special rules are used
     for the second group of frame-averaged data.  Check that the saturation
@@ -142,35 +141,35 @@ def test_group2_saturation_flagging_with_bias():
     # Frame 5 in group 2 has a 40000 count CR saturating the pixel
     # averaged over 5 frames this only looks like a 8000 count jump in group 2
     # but group 3 signal saturates
-    
+
     bias[5, 5] = 15000
-    
+
     data[0, 0, 5, 5] = 18000
     data[0, 1, 5, 5] = 31000
     data[0, 2, 5, 5] = 68000
     data[0, 3, 5, 5] = 73000  # Signal reaches saturation limit
     data[0, 4, 5, 5] = 78000
-    
-        
+
+
     # Add another pixel with bias of 15000, but no source flux
     # pixel counts are 15000 > sat_thresh/5, but should not be flagged as
     # saturated.
     bias[15, 15] = 15000
-    
+
     data[0, :, 15, 15] = 15000
 
     # Set saturation value in the saturation model
     satvalue = 60000
     sat_thresh[5, 5] = satvalue
     sat_thresh[15, 15] = satvalue
-    
+
 
     # set read_pattern to have 5 reads per group.
     read_pattern = [
-        [1, 2, 3, 4, 5], 
-        [6, 7, 8, 9, 10], 
-        [11, 12, 13, 14, 15], 
-        [16, 17, 18, 19, 20], 
+        [1, 2, 3, 4, 5],
+        [6, 7, 8, 9, 10],
+        [11, 12, 13, 14, 15],
+        [16, 17, 18, 19, 20],
         [21, 22, 23, 24, 25]
     ]