8000 Merge branch 'ErjanGavalji/fix-tests' · hbcodeXCI/NativeScript@92771d4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 92771d4

Browse files
ErjanGavaljiErjanGavalji
committed
Merge branch 'ErjanGavalji/fix-tests'
2 parents fa13b4f + 1307804 commit 92771d4

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ env:
44
- PACKAGE_VERSION=$DATE-$TRAVIS_BUILD_NUMBER
55
- PACKAGE_NAME=tns-core-modules
66
- NODE_VERSION=5.10.1
7-
- EMULATOR_API_VER=21
7+
- EMULATOR_API_VER=22
88
- RUNTIMEVERSION=next
99
- AVD_NAME=Arm$EMULATOR_API_VER
1010
addons:
@@ -34,7 +34,7 @@ before_script:
3434
- npm install
3535
- (cd build/platform-declarations && npm install)
3636
- echo no | android create avd --force -n $AVD_NAME -t android-$EMULATOR_API_VER -b armeabi-v7a -c 12M
37-
- emulator -avd $AVD_NAME -no-skin -no-audio -no-window &
37+
- emulator -avd $AVD_NAME -skin WXGA720 -no-audio -no-window &
3838
- android-wait-for-emulator
3939
script:
4040
- jdk_switcher use oraclejdk8

‎apps/tests/testRunner.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,10 @@ var testsWithLongDelay = {
106106
testLocationOnce: 10000,
107107
testLocationOnceMaximumAge: 10000,
108108
//web-view-tests
109-
testLoadExistingUrl: 10000,
110-
testLoadInvalidUrl: 10000
109+
testLoadExistingUrl: 10000 * 5,
110+
testLoadLocalFile: 10000 * 5,
111+
testLoadInvalidUrl: 10000,
112+
testLoadUpperCaseSrc: 10000 * 5
111113
}
112114

113115
var startTime;
@@ -150,7 +152,10 @@ function printRunTestStats() {
150152

151153
testFileContent = testFileContent.concat(testCases);
152154

153-
let finalMessage = `=== ALL TESTS COMPLETE for ${totalTime} ms === \n${(allTests.length - failedTestCount)} OK, ${failedTestCount} failed\n`;
155+
// DO NOT CHANGE THE FIRST ROW! Used as an indicator for test run pass detection.
156+
let finalMessage = `=== ALL TESTS COMPLETE ===\n` +
157+
`${(allTests.length - failedTestCount)} OK, ${failedTestCount} failed\n` +
158+
`DURATION: ${totalTime} ms`;
154159
TKUnit.write(finalMessage, messageType.info);
155160
for (j = 0; j < failedTestInfo.length; j++) {
156161
let failureMessage = failedTestInfo[j];

‎build/travis-scripts/check-testrun-broken.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env node
22
var fsModule = require('fs');
33
var resultsFile = 'TestRunResult.txt';
4-
var successMarker = /=== ALL TESTS COMPLETE for \d+ ms ===/;
5-
var passMarker = /=== ALL TESTS COMPLETE for \d+ ms ===\s+[^\n]*OK,\s+0\s+failed/mg;
4+
var successMarker = /=== ALL TESTS COMPLETE ===/;
5+
var passMarker = /=== ALL TESTS COMPLETE ===\s+[^\n]*OK,\s+0\s+failed/mg;
66

77
var messages = {
88
crash: 'TEST RUN CRASHED!',

0 commit comments

Comments
 (0)
0