@@ -685,20 +685,20 @@ def test_prepend_not_one(self):
685
685
a = np .zeros (5 )
686
686
687
687
# Too large and not only ones.
688
- assert_raises (ValueError , assign , a , s_ [...], np .ones ((2 , 1 )))
689
- assert_raises (ValueError , assign , a , s_ [[1 , 2 , 3 ],], np .ones ((2 , 1 )))
690
- assert_raises (ValueError , assign , a , s_ [[[1 ], [2 ]],], np .ones ((2 ,2 ,1 )))
688
+ assert_raises (( ValueError , RuntimeError ) , assign , a , s_ [...], np .ones ((2 , 1 )))
689
+ assert_raises (( ValueError , RuntimeError ) , assign , a , s_ [[1 , 2 , 3 ],], np .ones ((2 , 1 )))
690
+ assert_raises (( ValueError , RuntimeError ) , assign , a , s_ [[[1 ], [2 ]],], np .ones ((2 ,2 ,1 )))
691
691
692
692
def test_simple_broadcasting_errors (self ):
693
693
assign = self .assign
694
694
s_ = np .s_
695
695
a = np .zeros ((5 , 1 ))
696
696
697
- assert_raises (ValueError , assign , a , s_ [...], np .zeros ((5 , 2 )))
698
- assert_raises (ValueError , assign , a , s_ [...], np .zeros ((5 , 0 )))
699
- assert_raises (ValueError , assign , a , s_ [:, [0 ]], np .zeros ((5 , 2 )))
700
- assert_raises (ValueError , assign , a , s_ [:, [0 ]], np .zeros ((5 , 0 )))
701
- assert_raises (ValueError , assign , a , s_ [[0 ], :], np .zeros ((2 , 1 )))
697
+ assert_raises (( ValueError , RuntimeError ) , assign , a , s_ [...], np .zeros ((5 , 2 )))
698
+ assert_raises (( ValueError , RuntimeError ) , assign , a , s_ [...], np .zeros ((5 , 0 )))
699
+ assert_raises (( ValueError , RuntimeError ) , assign , a , s_ [:, [0 ]], np .zeros ((5 , 2 )))
700
+ assert_raises (( ValueError , RuntimeError ) , assign , a , s_ [:, [0 ]], np .zeros ((5 , 0 )))
701
+ assert_raises (( ValueError , RuntimeError ) , assign , a , s_ [[0 ], :], np .zeros ((2 , 1 )))
702
702
703
703
@pytest .mark .parametrize ("index" , [
704
704
(..., [1 , 2 ], slice (None )),
@@ -711,7 +711,7 @@ def test_broadcast_error_reports_correct_shape(self, index):
711
711
# We currently report without any spaces (could be changed)
712
712
shape_str = str (arr [index ].shape ).replace (" " , "" )
713
713
714
- with pytest .raises (ValueError ) as e :
714
+ with pytest .raises (( ValueError , RuntimeError ) ) as e :
715
715
arr [index ] = values
716
716
717
717
assert str (e .value ).endswith (shape_str )
0 commit comments