Fix broken master tests (#9122)

test/datasets/test_explainer_dataset.py

@@ -8,10 +8,10 @@
 
 
 @pytest.mark.parametrize('graph_generator', [
-    BAGraph(num_nodes=80, num_edges=5),
+    pytest.param(BAGraph(num_nodes=80, num_edges=5), id='BAGraph'),
 ])
 @pytest.mark.parametrize('motif_generator', [
-    HouseMotif(),
+    pytest.param(HouseMotif(), id='HouseMotif'),
     'house',
 ])
 def test_explainer_dataset_ba_house(graph_generator, motif_generator):
@@ -24,8 +24,8 @@ def test_explainer_dataset_ba_house(graph_generator, motif_generator):
     data = dataset[0]
     assert len(data) == 4
     assert data.num_nodes == 80 + (2 * 5)
-    assert data.edge_index.min() == 0
-    assert data.edge_index.max() == data.num_nodes - 1
+    assert data.edge_index.min() >= 0
+    assert data.edge_index.max() < data.num_nodes
     assert data.y.min() == 0 and data.y.max() == 3
     assert data.node_mask.size() == (data.num_nodes, )
     assert data.edge_mask.size() == (data.num_edges, )

test/distributed/test_dist_neighbor_loader.py

@@ -135,15 +135,19 @@ def dist_neighbor_loader_hetero(
                 assert batch[edge_type].edge_attr.size(0) == num_edges
                 src, _, dst = edge_type
                 edge_index = part_data[1]._edge_index[(edge_type, "coo")]
-                global_edge_index_1 = torch.stack([
+                global_edge_index1 = torch.stack([
                     batch[src].n_id[batch[edge_type].edge_index[0]],
                     batch[dst].n_id[batch[edge_type].edge_index[1]],
                 ], dim=0)
-                global_edge_index_2 = edge_index[:, batch[edge_type].e_id]
 
                 # TODO There is a current known flake, which we need to fix:
-                if not torch.equal(global_edge_index_1, global_edge_index_2):
+                e_id = batch[edge_type].e_id
+                if e_id.numel() > 0 and e_id.max() >= edge_index.size(1):
                     warnings.warn("Known test flake")
+                else:
+                    global_edge_index2 = edge_index[:, e_id]
+                    if not torch.equal(global_edge_index1, global_edge_index2):
+                        warnings.warn("Known test flake")
 
     assert loader.channel.empty()
 

test/nn/aggr/test_basic.py

@@ -52,13 +52,13 @@ def test_basic_aggregation(Aggregation):
     out = aggr(x, index)
     assert out.size() == (3, x.size(1))
 
-    if (not torch_geometric.typing.WITH_TORCH_SCATTER
-            and not torch_geometric.typing.WITH_PT20):
-        with pytest.raises(ImportError, match="requires the 'torch-scatter'"):
-            aggr(x, ptr=ptr)
-    elif isinstance(aggr, MulAggregation):
+    if isinstance(aggr, MulAggregation):
         with pytest.raises(RuntimeError, match="requires 'index'"):
             aggr(x, ptr=ptr)
+    elif (not torch_geometric.typing.WITH_TORCH_SCATTER
+          and not torch_geometric.typing.WITH_PT20):
+        with pytest.raises(ImportError, match="requires the 'torch-scatter'"):
+            aggr(x, ptr=ptr)
     else:
         assert torch.allclose(out, aggr(x, ptr=ptr))