The final noodle part 2

Author: JDBetteridge

tests/test_dimension.py

@@ -1502,15 +1502,19 @@ def test_stepping_dim_in_condition_lowering(self):
         # is in the generated code, but indentation etc. seems to vary.
         part1 = 'if (g[t0][x + 1][y + 1] <= 10)\n'
         part2 = 'g[t1][x + 1][y + 1] = g[t0][x + 1][y + 1] + 1'
-        part2_alt = 'gL0(t1, x + 1, y + 1) = gL0(t0, x + 1, y + 1) + 1'
         whole_code = str(op.ccode)
 
-        loc = whole_code.find(part1)
-        assert loc != -1
-        loc = whole_code.find(part2, loc + len(part1))
-        # Try the alternative string
-        if loc == -1:
-            assert whole_code.find(part2_alt, loc + len(part1)) != -1
+        try:
+            loc = whole_code.find(part1)
+            assert loc != -1
+            assert whole_code.find(part2, loc + len(part1)) != -1
+        except AssertionError:
+            # Try the alternative string
+            part1 = 'if (gL0(t0, x + 1, y + 1) <= 10)\n'
+            part2 = 'gL0(t1, x + 1, y + 1) = gL0(t0, x + 1, y + 1) + 1'
+            loc = whole_code.find(part1)
+            assert loc != -1
+            assert whole_code.find(part2, loc + len(part1)) != -1
 
     def test_expr_like_lowering(self):
         """