Browse Source

[ci] update event loop tests

Aleksandr Kuzmenko 4 years ago
parent
commit
1186128ce4

+ 3 - 2
tests/eventLoop/src/cases/TestEvents.hx

@@ -1,6 +1,6 @@
 package cases;
 package cases;
 
 
-@:timeout(1000)
+@:timeout(2000)
 class TestEvents extends utest.Test {
 class TestEvents extends utest.Test {
 
 
 	function testThreadRunWithEventLoop() {
 	function testThreadRunWithEventLoop() {
@@ -69,6 +69,7 @@ class TestEvents extends utest.Test {
 	@:depends(testRun)
 	@:depends(testRun)
 	function testPromisedEvents(async:Async) {
 	function testPromisedEvents(async:Async) {
 		var mainThread = Thread.current();
 		var mainThread = Thread.current();
+		mainThread.events.promise();
 		// this thread is expected to wait for promised events
 		// this thread is expected to wait for promised events
 		Thread.createWithEventLoop(() -> {
 		Thread.createWithEventLoop(() -> {
 			var eventsExecuted = 0;
 			var eventsExecuted = 0;
@@ -92,7 +93,7 @@ class TestEvents extends utest.Test {
 				testThread.events.runPromised(() -> {
 				testThread.events.runPromised(() -> {
 					++eventsExecuted;
 					++eventsExecuted;
 					isTrue(testThread == Thread.current());
 					isTrue(testThread == Thread.current());
-					mainThread.events.run(() -> {
+					mainThread.events.runPromised(() -> {
 						equals(3, eventsExecuted);
 						equals(3, eventsExecuted);
 						async.done();
 						async.done();
 					});
 					});

+ 4 - 2
tests/eventLoop/src/cases/TestTimer.hx

@@ -5,6 +5,8 @@ import haxe.Timer;
 @:timeout(10000)
 @:timeout(10000)
 @:depends(cases.TestEvents)
 @:depends(cases.TestEvents)
 class TestTimer extends utest.Test {
 class TestTimer extends utest.Test {
+	static inline var APPROX_FACTOR = 0.95;
+
 	function testCorrectInterval(async:Async) {
 	function testCorrectInterval(async:Async) {
 		async.branch(async -> {
 		async.branch(async -> {
 			var i = 0;
 			var i = 0;
@@ -14,7 +16,7 @@ class TestTimer extends utest.Test {
 			t.run = () -> {
 			t.run = () -> {
 				var dt = Timer.stamp() - start;
 				var dt = Timer.stamp() - start;
 				//check the interval is ~100ms
 				//check the interval is ~100ms
-				isTrue(dt >= interval * 0.98, 'Passed time ($dt seconds) is too small. At least $interval seconds expected.');
+				isTrue(dt >= interval * APPROX_FACTOR, 'Passed time ($dt seconds) is too small. At least $interval seconds expected.');
 				if(i++ > 5) {
 				if(i++ > 5) {
 					t.stop();
 					t.stop();
 					async.done();
 					async.done();
@@ -29,7 +31,7 @@ class TestTimer extends utest.Test {
 			Timer.delay(() -> {
 			Timer.delay(() -> {
 				var dt = Timer.stamp() - start;
 				var dt = Timer.stamp() - start;
 				//check the interval is ~50ms
 				//check the interval is ~50ms
-				isTrue(dt >= delay * 0.98, 'Passed time ($dt seconds) is too small. At least $delay seconds expected.');
+				isTrue(dt >= delay * APPROX_FACTOR, 'Passed time ($dt seconds) is too small. At least $delay seconds expected.');
 				async.done();
 				async.done();
 			}, Std.int(delay * 1000));
 			}, Std.int(delay * 1000));
 		});
 		});