diff --git a/.travis.yml b/.travis.yml index d9c612cad..864d5433d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,12 +28,12 @@ jobs: env: PKGS="dwds example webdev" script: ./tool/travis.sh dartanalyzer_1 - stage: unit_test - name: "SDK: 2.2.1-dev.2.0; PKG: dwds; TASKS: `pub run test`" + name: "SDK: 2.2.1-dev.2.0; PKG: dwds; TASKS: `pub run test -j 1`" dart: "2.2.1-dev.2.0" env: PKGS="dwds" script: ./tool/travis.sh test_0 - stage: unit_test - name: "SDK: dev; PKG: dwds; TASKS: `pub run test`" + name: "SDK: dev; PKG: dwds; TASKS: `pub run test -j 1`" dart: dev env: PKGS="dwds" script: ./tool/travis.sh test_0 diff --git a/dwds/example/hello_world/index.html b/dwds/example/hello_world/index.html index dfd4158f0..d93440a94 100644 --- a/dwds/example/hello_world/index.html +++ b/dwds/example/hello_world/index.html @@ -2,10 +2,6 @@ - diff --git a/dwds/mono_pkg.yaml b/dwds/mono_pkg.yaml index f52d3cde5..f510dc193 100644 --- a/dwds/mono_pkg.yaml +++ b/dwds/mono_pkg.yaml @@ -13,4 +13,4 @@ stages: - dartanalyzer: --fatal-warnings . dart: [2.2.1-dev.2.0] - unit_test: - - test: + - test: -j 1 diff --git a/dwds/test/test_context.dart b/dwds/test/test_context.dart index 123170c29..6002e7d3a 100644 --- a/dwds/test/test_context.dart +++ b/dwds/test/test_context.dart @@ -1,9 +1,10 @@ +import 'dart:async'; import 'dart:convert'; import 'dart:io'; +import 'package:dwds/service.dart'; import 'package:dwds/src/chrome_proxy_service.dart'; import 'package:dwds/src/helpers.dart'; -import 'package:dwds/service.dart'; import 'package:http/http.dart' as http; import 'package:test/test.dart'; import 'package:webdriver/io.dart'; @@ -36,12 +37,18 @@ class TestContext { webdev.stderr .transform(const Utf8Decoder()) .transform(const LineSplitter()) - .listen(printOnFailure); - await webdev.stdout + .listen(print); + var assetReadyCompleter = Completer(); + webdev.stdout .transform(const Utf8Decoder()) .transform(const LineSplitter()) - .takeWhile((line) => !line.contains('$port')) - .drain(); + .listen((line) { + if (line.contains('$port') && !assetReadyCompleter.isCompleted) { + assetReadyCompleter.complete(); + } + printOnFailure(line); + }); + await assetReadyCompleter.future; appUrl = 'http://localhost:$port/hello_world/'; var debugPort = await findUnusedPort(); webDriver = await createDriver(desired: { @@ -71,8 +78,11 @@ class TestContext { return result.body; }; + var instanceId = + await tabConnection.runtime.evaluate(r'window.$dartAppInstanceId'); + debugService = await DebugService.start( - 'localhost', connection, assetHandler, 'instance-id-for-testing'); + 'localhost', connection, assetHandler, instanceId.value.toString()); } Future tearDown() async { diff --git a/tool/travis.sh b/tool/travis.sh index dedff671b..84d558408 100755 --- a/tool/travis.sh +++ b/tool/travis.sh @@ -37,8 +37,8 @@ for PKG in ${PKGS}; do ;; test_0) echo echo -e '\033[1mTASK: test_0\033[22m' - echo -e 'pub run test' - pub run test || EXIT_CODE=$? + echo -e 'pub run test -j 1' + pub run test -j 1 || EXIT_CODE=$? ;; test_1) echo echo -e '\033[1mTASK: test_1\033[22m'