Fix tests that was dependent of the exact toposort order.

doc/tutorial/shape_info.txt

@@ -25,9 +25,9 @@ Currently, information regarding shape is used in two ways in Theano:
 >>> f = theano.function([x], (x ** 2).shape)
 >>> theano.printing.debugprint(f) # doctest: +NORMALIZE_WHITESPACE
 MakeVector{dtype='int64'} [id A] ''   2
- |Shape_i{0} [id B] ''   1
+ |Shape_i{0} [id B] ''   0
  | |x [id C]
- |Shape_i{1} [id D] ''   0
+ |Shape_i{1} [id D] ''   1
    |x [id C]
     
 

theano/gof/tests/test_link.py

@@ -153,7 +153,7 @@ class TestWrapLinker(unittest.TestCase):
         i[0].data = 1
         i[1].data = 2
         fn()
-        assert nodes == [div, add, mul]
+        assert nodes == [div, add, mul] or nodes == [add, div, mul]
         assert o[0].data is None
 
     def test_1(self):
@@ -171,7 +171,7 @@ class TestWrapLinker(unittest.TestCase):
         i[0].data = 1
         i[1].data = 2
         fn()
-        assert nodes == [div, add, mul]
+        assert nodes == [div, add, mul] or nodes == [add, div, mul]
         assert o[0].data == 1.5
 
 

theano/tensor/tests/test_opt.py

@@ -1568,14 +1568,19 @@ def test_log1p():
     y = fmatrix()
     f = function([x, y], T.log(tensor.fill(y, 1) + (x)), mode=m)
     # the first three ops are Shape_i, Shape_i, and Dimshuffle
-    assert [node.op for node in f.maker.fgraph.toposort()][3:] == [
-        T.log1p, tensor.alloc]
+    topo = f.maker.fgraph.toposort()
+    assert topo[-1].op == tensor.alloc
+    assert T.log1p in [node.op for node in topo]
+
     f = function([x, y], T.log(0 + (x) + tensor.fill(y, 1.0)), mode=m)
-    assert [node.op for node in f.maker.fgraph.toposort()][3:] == [
-        T.log1p, tensor.alloc]
+    topo = f.maker.fgraph.toposort()
+    assert topo[-1].op == tensor.alloc
+    assert T.log1p in [node.op for node in topo]
+
     f = function([x, y], T.log(2 + (x) - tensor.fill(y, 1.0)), mode=m)
-    assert ([node.op for node in f.maker.fgraph.toposort()][3:] ==
-            [T.log1p, tensor.alloc])
+    topo = f.maker.fgraph.toposort()
+    assert topo[-1].op == tensor.alloc
+    assert T.log1p in [node.op for node in topo]
 
     f([1e-7, 10], [[0, 0], [0, 0]])  # debugmode will verify values