run Uv.init/close just once in the asys tests

tests/asys/Main.hx

@@ -3,8 +3,17 @@ import utest.ui.Report;
 
 import sys.FileSystem;
 
+#if hl
+import hl.Uv;
+#elseif eval
+import eval.Uv;
+#elseif neko
+import neko.Uv;
+#end
+
 class Main {
 	public static function main():Void {
+		Uv.init();
 		if (FileSystem.exists("resources-rw")) {
 			function walk(path:String):Void {
 				for (f in FileSystem.readDirectory(path)) {
@@ -25,5 +34,7 @@ class Main {
 		runner.onTestStart.add(test -> trace("running", Type.getClassName(Type.getClass(test.fixture.target)), test.fixture.method));
 		Report.create(runner);
 		runner.run();
+		Uv.run(RunDefault);
+		Uv.close();
 	}
 }

tests/asys/TestBase.hx

@@ -14,17 +14,11 @@ class TestBase {
 	static var helpers:Map<Process, {?exit:ProcessExit}> = [];
 
 	public static function uvSetup():Void {
-		Uv.init();
+
 	}
 
 	public static function uvTeardown():Void {
 		helperTeardown();
-		Uv.run(RunDefault);
-		Uv.close();
-	}
-
-	public static function uvRun(?mode:asys.uv.UVRunMode = asys.uv.UVRunMode.RunDefault):Bool {
-		return Uv.run(mode);
 	}
 
 	/**

tests/asys/test/TestAsyncFile.hx

@@ -81,7 +81,6 @@ class TestAsyncFile extends Test {
 		});
 
 		eq(asyncDone, 0);
-		TestBase.uvRun();
 	}
 
 	/**
@@ -128,6 +127,5 @@ class TestAsyncFile extends Test {
 		});
 
 		eq(asyncDone, 0);
-		TestBase.uvRun();
 	}
 }

tests/asys/test/TestAsyncFileSystem.hx

@@ -22,7 +22,6 @@ class TestAsyncFileSystem extends Test {
 		}));
 
 		eq(asyncDone, 0);
-		TestBase.uvRun();
 	}
 
 	function testStat(async:Async) {
@@ -72,7 +71,6 @@ class TestAsyncFileSystem extends Test {
 		});
 
 		eq(asyncDone, 0);
-		TestBase.uvRun();
 	}
 
 	@:timeout(3000)
@@ -97,7 +95,6 @@ class TestAsyncFileSystem extends Test {
 
 		NewFS.mkdir('$dir/foo');
 
-		TestBase.uvRun(RunOnce);
 		t(events.length == 1 && events[0].match(Rename("foo")));
 		events.resize(0);
 
@@ -108,12 +105,10 @@ class TestAsyncFileSystem extends Test {
 
 		NewFS.rmdir('$dir/foo');
 
-		TestBase.uvRun(RunOnce);
 		t(events.length == 2 && events[0].match(Rename("foo/hello.txt")));
 		t(events.length == 2 && events[1].match(Rename("foo")));
 		events.resize(0);
 
 		watcher.close();
-		TestBase.uvRun(RunOnce);
 	}
 }

tests/asys/test/TestDns.hx

@@ -10,8 +10,6 @@ class TestDns extends Test {
 			t(res[0].match(Ipv4(0x7F000001)));
 			done();
 		}));
-
-		TestBase.uvRun();
 	}
 
 	function testIpv4(async:Async) {
@@ -30,8 +28,6 @@ class TestDns extends Test {
 			t(res[0].match(Ipv4(0xFFFFFFFF)));
 			done();
 		}));
-
-		TestBase.uvRun();
 	}
 
 	function testIpv6(async:Async) {
@@ -50,7 +46,5 @@ class TestDns extends Test {
 			t(res[0].match(Ipv6(beq(_, Bytes.ofHex("4861786520697320617765736F6D6521")) => _)));
 			done();
 		}));
-
-		TestBase.uvRun();
 	}
 }

tests/asys/test/TestIpc.hx

@@ -49,8 +49,6 @@ class TestIpc extends Test {
 					});
 				});
 		});
-
-		TestBase.uvRun();
 	}
 
 	/*
@@ -72,8 +70,6 @@ class TestIpc extends Test {
 			});
 		});
 		proc.send({message: {a: [1, 2], b: "c", d: true}});
-
-		TestBase.uvRun();
 	}
 	*/
 }

tests/asys/test/TestProcess.hx

@@ -5,23 +5,15 @@ import utest.Async;
 
 class TestProcess extends Test {
 	function testPipes(async:Async) {
-		if (Sys.systemName() == "Windows") { // TODO
-			t(true);
-			async.done();
-			return;
-		}
-
 		var proc = asys.Process.spawn("cat");
 		proc.stdout.dataSignal.on(data -> {
 			beq(data, TestConstants.helloBytes);
-			proc.kill();
+			// proc.kill(); // TODO: not implemented?
 			proc.close((err) -> {
 				eq(err, null);
 				async.done();
 			});
 		});
 		proc.stdin.write(TestConstants.helloBytes);
-
-		TestBase.uvRun();
 	}
 }

tests/asys/test/TestStreams.hx

@@ -16,8 +16,6 @@ class TestStreams extends Test {
 			aeq(calls, [1, 2, 3]);
 			async.done();
 		});
-
-		TestBase.uvRun();
 	}
 
 	function testReadHWM(async:Async) {
@@ -63,8 +61,6 @@ class TestStreams extends Test {
 				done();
 			});
 		});
-
-		TestBase.uvRun();
 	}
 
 	function testPassiveRead(async:Async) {
@@ -76,14 +72,11 @@ class TestStreams extends Test {
 		stream.pause();
 
 		Sys.sleep(.05);
-		TestBase.uvRun(RunOnce);
 
 		stream.dataSignal.on((chunk) -> calls.push(chunk.length));
 		stream.endSignal.once(() -> {
 			aeq(calls, [11, 1, 12, 2, 13, 3]);
 			async.done();
 		});
-
-		TestBase.uvRun();
 	}
 }

tests/asys/test/TestTcp.hx

@@ -24,6 +24,7 @@ class TestTcp extends Test {
 					done();
 				});
 			}));
+			server.unref();
 			server.listeningSignal.on(() -> {
 				t(server.localAddress.match(Network(AddressTools.equals(_, "127.0.0.1".toIp()) => true, 3232)));
 				done();
@@ -31,8 +32,6 @@ class TestTcp extends Test {
 			server.errorSignal.on(err -> assert());
 		}, 2);
 
-		TestBase.uvRun(RunOnce);
-
 		sub(async, done -> {
 			var client:asys.net.Socket = null;
 			client = asys.Net.createConnection({
@@ -55,10 +54,9 @@ class TestTcp extends Test {
 					});
 				});
 		});
-
-		TestBase.uvRun();
 	}
 
+	@:timeout(1500)
 	function testSignals(async:Async) {
 		sub(async, done -> {
 			var client = asys.net.Socket.create();
@@ -81,8 +79,6 @@ class TestTcp extends Test {
 					}
 				});
 		}, 2);
-
-		TestBase.uvRun();
 	}
 	#end
 }

tests/asys/test/TestUdp.hx

@@ -10,6 +10,7 @@ class TestUdp extends Test {
 	function testEcho(async:Async) {
 		sub(async, done -> {
 			var server = asys.net.UdpSocket.create(Ipv4);
+			server.unref();
 			server.bind("127.0.0.1".toIp(), 3232);
 			server.messageSignal.on(msg -> {
 				beq(msg.data, TestConstants.helloBytes);
@@ -30,13 +31,12 @@ class TestUdp extends Test {
 				});
 			});
 		});
-
-		TestBase.uvRun();
 	}
 
 	function testEcho6(async:Async) {
 		sub(async, done -> {
 			var server = asys.net.UdpSocket.create(Ipv6);
+			server.unref();
 			server.bind(AddressTools.localhost(Ipv6), 3232);
 			server.messageSignal.on(msg -> {
 				beq(msg.data, TestConstants.helloBytes);
@@ -57,8 +57,6 @@ class TestUdp extends Test {
 				});
 			});
 		});
-
-		TestBase.uvRun();
 	}
 	#end
 }