fixup! debug

Author: JamesWrigley

test/topology.jl

@@ -3,11 +3,11 @@
 using Random
 
 @testset "Topology" begin
-    pids = addprocs_with_testenv(4; topology="master_worker")
+    # pids = addprocs_with_testenv(4; topology="master_worker")
 
-    let p1 = pids[1], p2 = pids[2]
-        @test_throws RemoteException remotecall_fetch(()->remotecall_fetch(myid, p2), p1)
-    end
+    # let p1 = pids[1], p2 = pids[2]
+    #     @test_throws RemoteException remotecall_fetch(()->remotecall_fetch(myid, p2), p1)
+    # end
 
     function test_worker_counts()
         # check if the nprocs/nworkers/workers are the same on the remaining workers
@@ -70,29 +70,29 @@ using Random
         end
     end
 
-    addprocs_with_testenv(TopoTestManager(8); topology="custom")
-
-    while true
-        if any(x->get(map_pid_ident, x, 0)==0, workers())
-            yield()
-        else
-            break
-        end
-    end
-
-    let p1, p2
-        for p1 in workers()
-            for p2 in workers()
-                i1 = map_pid_ident[p1]
-                i2 = map_pid_ident[p2]
-                if (iseven(i1) && iseven(i2)) || (isodd(i1) && isodd(i2))
-                    @test p2 == remotecall_fetch(p->remotecall_fetch(myid, p), p1, p2)
-                else
-                    @test_throws RemoteException remotecall_fetch(p->remotecall_fetch(myid, p), p1, p2)
-                end
-            end
-        end
-    end
+    # addprocs_with_testenv(TopoTestManager(8); topology="custom")
+
+    # while true
+    #     if any(x->get(map_pid_ident, x, 0)==0, workers())
+    #         yield()
+    #     else
+    #         break
+    #     end
+    # end
+
+    # let p1, p2
+    #     for p1 in workers()
+    #         for p2 in workers()
+    #             i1 = map_pid_ident[p1]
+    #             i2 = map_pid_ident[p2]
+    #             if (iseven(i1) && iseven(i2)) || (isodd(i1) && isodd(i2))
+    #                 @test p2 == remotecall_fetch(p->remotecall_fetch(myid, p), p1, p2)
+    #             else
+    #                 @test_throws RemoteException remotecall_fetch(p->remotecall_fetch(myid, p), p1, p2)
+    #             end
+    #         end
+    #     end
+    # end
 
     remove_workers_and_test()
 
@@ -107,40 +107,40 @@ using Random
     end
 
     addprocs_with_testenv(8)
-    def_count_conn()
-
-    # Test for 10 random combinations
-    wl = workers()
-    combinations = []
-    while length(combinations) < 10
-        from = rand(wl)
-        to = rand(wl)
-        if from == to || ((from,to) in combinations) || ((to,from) in combinations)
-            continue
-        else
-            push!(combinations, (from,to))
-        end
-    end
-
-    # Initially only master-worker connections ought to be setup
-    expected_num_conns = 8
-    let num_conns = sum(asyncmap(p->remotecall_fetch(count_connected_workers,p), workers()))
-        @test num_conns == expected_num_conns
-    end
-
-    for (i, (from,to)) in enumerate(combinations)
-        remotecall_wait(topid->remotecall_fetch(myid, topid), from, to)
-        expected_num_conns += 2    # one connection endpoint on both from and to
-        let num_conns = sum(asyncmap(p->remotecall_fetch(count_connected_workers,p), workers()))
-            @test num_conns == expected_num_conns
-        end
-    end
+    # def_count_conn()
+
+    # # Test for 10 random combinations
+    # wl = workers()
+    # combinations = []
+    # while length(combinations) < 10
+    #     from = rand(wl)
+    #     to = rand(wl)
+    #     if from == to || ((from,to) in combinations) || ((to,from) in combinations)
+    #         continue
+    #     else
+    #         push!(combinations, (from,to))
+    #     end
+    # end
+
+    # # Initially only master-worker connections ought to be setup
+    # expected_num_conns = 8
+    # let num_conns = sum(asyncmap(p->remotecall_fetch(count_connected_workers,p), workers()))
+    #     @test num_conns == expected_num_conns
+    # end
+
+    # for (i, (from,to)) in enumerate(combinations)
+    #     remotecall_wait(topid->remotecall_fetch(myid, topid), from, to)
+    #     expected_num_conns += 2    # one connection endpoint on both from and to
+    #     let num_conns = sum(asyncmap(p->remotecall_fetch(count_connected_workers,p), workers()))
+    #         @test num_conns == expected_num_conns
+    #     end
+    # end
 
     # With lazy=false, all connections ought to be setup during `addprocs`
     nprocs() > 1 && rmprocs(workers())
     addprocs_with_testenv(8; lazy=false)
-    def_count_conn()
-    @test sum(asyncmap(p->remotecall_fetch(count_connected_workers,p), workers())) == 64
+    # def_count_conn()
+    # @test sum(asyncmap(p->remotecall_fetch(count_connected_workers,p), workers())) == 64
 
     # Cannot add more workers with a different `lazy` value
     @test_throws ArgumentError addprocs_with_testenv(1; lazy=true)