noodling2

Author: JDBetteridge

tests/test_caching.py

@@ -678,7 +678,8 @@ def test_sparse_function(self, operate_on_empty_cache):
         ncreated = 2+1+2+2+2+1+4
         # Note that injection is now lazy so no new symbols should be created
         assert len(_SymbolCache) == cur_cache_size
-        _ = i.evaluate
+        # The expression is not redundant, but storing it changes the symbol count
+        i.evaluate  # noqa: B018
 
         assert len(_SymbolCache) == cur_cache_size + ncreated
 

tests/test_dimension.py

@@ -1492,8 +1492,8 @@ def test_stepping_dim_in_condition_lowering(self):
         op.apply(time_M=threshold+3)
         assert np.all(g.data[0, :, :] == threshold)
         assert np.all(g.data[1, :, :] == threshold + 1)
-        assert 'if (g[t0][x + 1][y + 1] <= 10)\n' + \
-            '{\n g[t1][x + 1][y + 1] = g[t0][x + 1][y + 1] + 1' in str(op.ccode)
+        assert 'if (g[t0][x + 1][y + 1] <= 10)\n        {' + \
+            '\n          g[t1][x + 1][y + 1] = g[t0][x + 1][y + 1] + 1' in str(op.ccode)
 
     def test_expr_like_lowering(self):
         """

tests/test_dle.py

@@ -21,8 +21,10 @@
 
 
 def get_blocksizes(op, opt, grid, blockshape, level=0):
-    blocksizes = {f'{d}0_blk{level}_size': v
-                  for d, v in zip(grid.dimensions, blockshape, strict=True)}
+    blocksizes = {
+        f'{d}0_blk{level}_size': v
+        for d, v in zip(grid.dimensions, blockshape, strict=False)
+    }
     blocksizes = {k: v for k, v in blocksizes.items() if k in op._known_arguments}
     # Sanity check
     if grid.dim == 1 or len(blockshape) == 0: