fixup! debug

Author: JamesWrigley

test/topology.jl

@@ -70,29 +70,29 @@ using Random
         end
     end
 
-    addprocs_with_testenv(TopoTestManager(8); topology="custom")
+    # 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
+    # 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
+    # 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
 
     @info "finished TopoTestManager"
     remove_workers_and_test()
@@ -110,36 +110,37 @@ using Random
     addprocs_with_testenv(8)
     def_count_conn()
 
-    # @info "10 random combinations"
-    # # 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
+    @info "10 random combinations"
+    # 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
+    # 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
+    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
 
     @info "finished master-worker"
     # With lazy=false, all connections ought to be setup during `addprocs`
+    @show workers()
     nprocs() > 1 && rmprocs(workers())
     addprocs_with_testenv(8; lazy=false)
     def_count_conn()