tests: Update blocking tests

Author: EdCaunt

tests/test_dimension.py

@@ -1958,21 +1958,21 @@ def test_topofusion_w_subdims_conddims(self):
 
         # Check generated code -- expect the gsave equation to be scheduled together
         # in the same loop nest with the fsave equation
-        bns, _ = assert_blocking(op, {'x0_blk0', 'x2_blk0', 'x1_blk0'})
+        bns, _ = assert_blocking(op, {'x0_blk0', 'x1_blk0', 'x2_blk0'})
         exprs = FindNodes(Expression).visit(bns['x0_blk0'])
         assert len(exprs) == 2
         assert exprs[0].write is f
         assert exprs[1].write is g
 
+        exprs = FindNodes(Expression).visit(bns['x1_blk0'])
+        assert len(exprs) == 1
+        assert exprs[0].write is h
+
         exprs = FindNodes(Expression).visit(bns['x2_blk0'])
         assert len(exprs) == 2
         assert exprs[0].write is fsave
         assert exprs[1].write is gsave
 
-        exprs = FindNodes(Expression).visit(bns['x1_blk0'])
-        assert len(exprs) == 1
-        assert exprs[0].write is h
-
     def test_topofusion_w_subdims_conddims_v2(self):
         """
         Like `test_topofusion_w_subdims_conddims` but with more SubDomains,

tests/test_subdomains.py

@@ -680,8 +680,8 @@ class Dummy(SubDomainSet):
         # Make sure it jit-compiles
         op.cfunction
 
-        assert_structure(op, ['t,n0', 't,n0,ix0_blk0,iy0_blk0,x,y,z'],
-                         't,n0,ix0_blk0,iy0_blk0,x,y,z')
+        assert_structure(op, ['t,n0', 't,n0,x0_blk0,y0_blk0,x,y,z'],
+                         't,n0,x0_blk0,y0_blk0,x,y,z')
 
         # Drag a rebuilt MultiSubDimension out of the operator
         dims = {d.name: d for d in FindSymbols('dimensions').visit(op)}