Update test following code review and fix DebugMode

theano/tensor/opt.py

@@ -3676,6 +3676,9 @@ class Canonizer(gof.LocalOptimizer):
             new = _fill_chain(new, node.inputs)[0]
 
         if new.type == out.type:
+            # This happen with test
+            # theano/tensor/tests/test_opt.py:T_local_switch_sink
+            new.tag.values_eq_approx = values_eq_approx_remove_inf_nan
             return [new]
         else:
             _logger.warning(' '.join(('CANONIZE FAILED: new, out = ',

theano/tensor/tests/test_opt.py

@@ -3983,11 +3983,11 @@ class T_local_switch_sink(unittest.TestCase):
                         resm[idx])).sum() == self.resm[idx].size
                 idx += 1
 
-    # This case caused a missed optimization in the past.
-    x = T.dscalar('x')
-    y = T.switch(x < 7, x, T.sqrt(x - 7))
-    f = theano.function([x], T.grad(y, x))
-    assert f(5) == 1, f(5)
+        # This case caused a missed optimization in the past.
+        x = T.dscalar('x')
+        y = T.switch(x < 7, x, T.sqrt(x - 7))
+        f = theano.function([x], T.grad(y, x), self.mode)
+        assert f(5) == 1, f(5)
 
     @attr('slow')
     def test_local_div_switch_sink(self):