From 61b2d1710b2058bcc9fe076a80784b1cedb0dd6f Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 11 Nov 2019 18:09:55 -0500 Subject: [PATCH] Attempt to make static-html self-tests less flaky. --- .../.meteor/.finished-upgraders | 18 +++ .../.meteor/packages | 7 +- .../.meteor/release | 2 +- .../.meteor/versions | 108 +++++++++--------- .../.meteor/.finished-upgraders | 18 +++ .../.meteor/packages | 7 +- .../.meteor/release | 2 +- .../.meteor/versions | 108 +++++++++--------- tools/tests/static-html.js | 3 +- 9 files changed, 162 insertions(+), 111 deletions(-) create mode 100644 tools/tests/apps/compiler-plugin-static-html-error/.meteor/.finished-upgraders create mode 100644 tools/tests/apps/compiler-plugin-static-html/.meteor/.finished-upgraders diff --git a/tools/tests/apps/compiler-plugin-static-html-error/.meteor/.finished-upgraders b/tools/tests/apps/compiler-plugin-static-html-error/.meteor/.finished-upgraders new file mode 100644 index 00000000000..4538749ab81 --- /dev/null +++ b/tools/tests/apps/compiler-plugin-static-html-error/.meteor/.finished-upgraders @@ -0,0 +1,18 @@ +# This file contains information which helps Meteor properly upgrade your +# app when you run 'meteor update'. You should check it into version control +# with your project. + +notices-for-0.9.0 +notices-for-0.9.1 +0.9.4-platform-file +notices-for-facebook-graph-api-2 +1.2.0-standard-minifiers-package +1.2.0-meteor-platform-split +1.2.0-cordova-changes +1.2.0-breaking-changes +1.3.0-split-minifiers-package +1.4.0-remove-old-dev-bundle-link +1.4.1-add-shell-server-package +1.4.3-split-account-service-packages +1.5-add-dynamic-import-package +1.7-split-underscore-from-meteor-base diff --git a/tools/tests/apps/compiler-plugin-static-html-error/.meteor/packages b/tools/tests/apps/compiler-plugin-static-html-error/.meteor/packages index 90bb03902fb..52841ee183a 100644 --- a/tools/tests/apps/compiler-plugin-static-html-error/.meteor/packages +++ b/tools/tests/apps/compiler-plugin-static-html-error/.meteor/packages @@ -2,5 +2,10 @@ # # 'meteor add' and 'meteor remove' will edit this file for you, # but you can also edit it by hand. -meteor-base +meteor-base@1.4.0 static-html +standard-minifier-css +standard-minifier-js +shell-server +dynamic-import +underscore diff --git a/tools/tests/apps/compiler-plugin-static-html-error/.meteor/release b/tools/tests/apps/compiler-plugin-static-html-error/.meteor/release index 621e94f0ec9..97064e19937 100644 --- a/tools/tests/apps/compiler-plugin-static-html-error/.meteor/release +++ b/tools/tests/apps/compiler-plugin-static-html-error/.meteor/release @@ -1 +1 @@ -none +METEOR@1.8.1 diff --git a/tools/tests/apps/compiler-plugin-static-html-error/.meteor/versions b/tools/tests/apps/compiler-plugin-static-html-error/.meteor/versions index 8e4831fde0b..2112029aa35 100644 --- a/tools/tests/apps/compiler-plugin-static-html-error/.meteor/versions +++ b/tools/tests/apps/compiler-plugin-static-html-error/.meteor/versions @@ -1,53 +1,55 @@ -autoupdate@1.2.2-plugins.0 -babel-compiler@5.8.3-plugins.0_5 -babel-runtime@0.1.2 -base64@1.0.4-plugins.0 -binary-heap@1.0.4-plugins.0 -blaze@2.1.3-plugins.0 -blaze-tools@1.0.4-plugins.0 -boilerplate-generator@1.0.4-plugins.0 -caching-compiler@1.0.0-plugins.1 -caching-html-compiler@1.0.0 -callback-hook@1.0.4-plugins.0 -check@1.0.6-plugins.0 -ddp@1.2.0-plugins.0 -ddp-client@1.2.0-plugins.0 -ddp-common@1.2.0-plugins.0 -ddp-server@1.2.0-plugins.1 -deps@1.0.8-plugins.0 -diff-sequence@1.0.0-plugins.0 -ecmascript@0.1.3-plugins.1 -ejson@1.0.7-plugins.0 -geojson-utils@1.0.4-plugins.0 -html-tools@1.0.5-plugins.0 -htmljs@1.0.5-plugins.0 -http@1.1.1-plugins.0 -id-map@1.0.4-plugins.0 -jquery@1.11.3-plugins.0_3 -json@1.0.4-plugins.0 -logging@1.0.8-plugins.0 -meteor@1.1.7-plugins.1 -minifiers@1.1.6-plugins.0 -minimongo@1.0.9-plugins.0 -mongo@1.1.1-plugins.0 -mongo-id@1.0.0-plugins.0 -npm-mongo@1.4.32-plugins.0_1 -observe-sequence@1.0.7-plugins.0 -ordered-dict@1.0.4-plugins.0 -promise@0.4.2-plugins.0 -random@1.0.4-plugins.0 -reactive-var@1.0.6-plugins.0 -reload@1.1.4-plugins.0 -retry@1.0.4-plugins.0 -routepolicy@1.0.6-plugins.0 -spacebars@1.0.7-plugins.0 -spacebars-compiler@1.0.7-plugins.1 -static-html@1.0.12 -templating@1.1.2-plugins.1 -templating-tools@0.0.1 -tracker@1.0.8-plugins.0 -ui@1.0.7-plugins.0 -underscore@1.0.4-plugins.0 -url@1.0.5-plugins.0 -webapp@1.2.1-plugins.0 -webapp-hashing@1.0.4-plugins.0 +autoupdate@1.6.0 +babel-compiler@7.3.4 +babel-runtime@1.3.0 +base64@1.0.12 +blaze-tools@1.0.10 +boilerplate-generator@1.6.0 +caching-compiler@1.2.1 +caching-html-compiler@1.1.3 +callback-hook@1.1.0 +check@1.3.1 +ddp@1.4.0 +ddp-client@2.3.3 +ddp-common@1.4.0 +ddp-server@2.3.0 +deps@1.0.12 +diff-sequence@1.1.1 +dynamic-import@0.5.1 +ecmascript@0.12.7 +ecmascript-runtime@0.7.0 +ecmascript-runtime-client@0.8.0 +ecmascript-runtime-server@0.7.1 +ejson@1.1.0 +es5-shim@4.8.0 +fetch@0.1.1 +hot-code-push@1.0.4 +html-tools@1.0.11 +htmljs@1.0.11 +id-map@1.1.0 +inter-process-messaging@0.1.0 +livedata@1.0.18 +logging@1.1.20 +meteor@1.9.3 +meteor-base@1.4.0 +minifier-css@1.4.2 +minifier-js@2.4.1 +modern-browsers@0.1.4 +modules@0.13.0 +modules-runtime@0.10.3 +mongo-id@1.0.7 +promise@0.11.2 +random@1.1.0 +reload@1.3.0 +retry@1.1.0 +routepolicy@1.1.0 +shell-server@0.4.0 +socket-stream-client@0.2.2 +spacebars-compiler@1.1.3 +standard-minifier-css@1.5.3 +standard-minifier-js@2.4.1 +static-html@1.2.2 +templating-tools@1.1.2 +tracker@1.2.0 +underscore@1.0.10 +webapp@1.7.4 +webapp-hashing@1.0.9 diff --git a/tools/tests/apps/compiler-plugin-static-html/.meteor/.finished-upgraders b/tools/tests/apps/compiler-plugin-static-html/.meteor/.finished-upgraders new file mode 100644 index 00000000000..4538749ab81 --- /dev/null +++ b/tools/tests/apps/compiler-plugin-static-html/.meteor/.finished-upgraders @@ -0,0 +1,18 @@ +# This file contains information which helps Meteor properly upgrade your +# app when you run 'meteor update'. You should check it into version control +# with your project. + +notices-for-0.9.0 +notices-for-0.9.1 +0.9.4-platform-file +notices-for-facebook-graph-api-2 +1.2.0-standard-minifiers-package +1.2.0-meteor-platform-split +1.2.0-cordova-changes +1.2.0-breaking-changes +1.3.0-split-minifiers-package +1.4.0-remove-old-dev-bundle-link +1.4.1-add-shell-server-package +1.4.3-split-account-service-packages +1.5-add-dynamic-import-package +1.7-split-underscore-from-meteor-base diff --git a/tools/tests/apps/compiler-plugin-static-html/.meteor/packages b/tools/tests/apps/compiler-plugin-static-html/.meteor/packages index 90bb03902fb..52841ee183a 100644 --- a/tools/tests/apps/compiler-plugin-static-html/.meteor/packages +++ b/tools/tests/apps/compiler-plugin-static-html/.meteor/packages @@ -2,5 +2,10 @@ # # 'meteor add' and 'meteor remove' will edit this file for you, # but you can also edit it by hand. -meteor-base +meteor-base@1.4.0 static-html +standard-minifier-css +standard-minifier-js +shell-server +dynamic-import +underscore diff --git a/tools/tests/apps/compiler-plugin-static-html/.meteor/release b/tools/tests/apps/compiler-plugin-static-html/.meteor/release index 621e94f0ec9..97064e19937 100644 --- a/tools/tests/apps/compiler-plugin-static-html/.meteor/release +++ b/tools/tests/apps/compiler-plugin-static-html/.meteor/release @@ -1 +1 @@ -none +METEOR@1.8.1 diff --git a/tools/tests/apps/compiler-plugin-static-html/.meteor/versions b/tools/tests/apps/compiler-plugin-static-html/.meteor/versions index 8e4831fde0b..2112029aa35 100644 --- a/tools/tests/apps/compiler-plugin-static-html/.meteor/versions +++ b/tools/tests/apps/compiler-plugin-static-html/.meteor/versions @@ -1,53 +1,55 @@ -autoupdate@1.2.2-plugins.0 -babel-compiler@5.8.3-plugins.0_5 -babel-runtime@0.1.2 -base64@1.0.4-plugins.0 -binary-heap@1.0.4-plugins.0 -blaze@2.1.3-plugins.0 -blaze-tools@1.0.4-plugins.0 -boilerplate-generator@1.0.4-plugins.0 -caching-compiler@1.0.0-plugins.1 -caching-html-compiler@1.0.0 -callback-hook@1.0.4-plugins.0 -check@1.0.6-plugins.0 -ddp@1.2.0-plugins.0 -ddp-client@1.2.0-plugins.0 -ddp-common@1.2.0-plugins.0 -ddp-server@1.2.0-plugins.1 -deps@1.0.8-plugins.0 -diff-sequence@1.0.0-plugins.0 -ecmascript@0.1.3-plugins.1 -ejson@1.0.7-plugins.0 -geojson-utils@1.0.4-plugins.0 -html-tools@1.0.5-plugins.0 -htmljs@1.0.5-plugins.0 -http@1.1.1-plugins.0 -id-map@1.0.4-plugins.0 -jquery@1.11.3-plugins.0_3 -json@1.0.4-plugins.0 -logging@1.0.8-plugins.0 -meteor@1.1.7-plugins.1 -minifiers@1.1.6-plugins.0 -minimongo@1.0.9-plugins.0 -mongo@1.1.1-plugins.0 -mongo-id@1.0.0-plugins.0 -npm-mongo@1.4.32-plugins.0_1 -observe-sequence@1.0.7-plugins.0 -ordered-dict@1.0.4-plugins.0 -promise@0.4.2-plugins.0 -random@1.0.4-plugins.0 -reactive-var@1.0.6-plugins.0 -reload@1.1.4-plugins.0 -retry@1.0.4-plugins.0 -routepolicy@1.0.6-plugins.0 -spacebars@1.0.7-plugins.0 -spacebars-compiler@1.0.7-plugins.1 -static-html@1.0.12 -templating@1.1.2-plugins.1 -templating-tools@0.0.1 -tracker@1.0.8-plugins.0 -ui@1.0.7-plugins.0 -underscore@1.0.4-plugins.0 -url@1.0.5-plugins.0 -webapp@1.2.1-plugins.0 -webapp-hashing@1.0.4-plugins.0 +autoupdate@1.6.0 +babel-compiler@7.3.4 +babel-runtime@1.3.0 +base64@1.0.12 +blaze-tools@1.0.10 +boilerplate-generator@1.6.0 +caching-compiler@1.2.1 +caching-html-compiler@1.1.3 +callback-hook@1.1.0 +check@1.3.1 +ddp@1.4.0 +ddp-client@2.3.3 +ddp-common@1.4.0 +ddp-server@2.3.0 +deps@1.0.12 +diff-sequence@1.1.1 +dynamic-import@0.5.1 +ecmascript@0.12.7 +ecmascript-runtime@0.7.0 +ecmascript-runtime-client@0.8.0 +ecmascript-runtime-server@0.7.1 +ejson@1.1.0 +es5-shim@4.8.0 +fetch@0.1.1 +hot-code-push@1.0.4 +html-tools@1.0.11 +htmljs@1.0.11 +id-map@1.1.0 +inter-process-messaging@0.1.0 +livedata@1.0.18 +logging@1.1.20 +meteor@1.9.3 +meteor-base@1.4.0 +minifier-css@1.4.2 +minifier-js@2.4.1 +modern-browsers@0.1.4 +modules@0.13.0 +modules-runtime@0.10.3 +mongo-id@1.0.7 +promise@0.11.2 +random@1.1.0 +reload@1.3.0 +retry@1.1.0 +routepolicy@1.1.0 +shell-server@0.4.0 +socket-stream-client@0.2.2 +spacebars-compiler@1.1.3 +standard-minifier-css@1.5.3 +standard-minifier-js@2.4.1 +static-html@1.2.2 +templating-tools@1.1.2 +tracker@1.2.0 +underscore@1.0.10 +webapp@1.7.4 +webapp-hashing@1.0.9 diff --git a/tools/tests/static-html.js b/tools/tests/static-html.js index 870f9b67e34..5eb89b36372 100644 --- a/tools/tests/static-html.js +++ b/tools/tests/static-html.js @@ -54,7 +54,8 @@ selftest.define("static-html - throws error", () => { s.cd('myapp'); const run = startRun(s); - run.matchBeforeExit("Attributes on not supported"); + run.match("Attributes on not supported"); + run.waitSecs(30); run.stop(); });