update travis tests to test against distribution build

starpit · starpit · commit 65c46832f4b1 · 2018-05-30T13:44:40.000-04:00
Fixes #987
diff --git a/.travis.yml b/.travis.yml
@@ -14,6 +14,8 @@ addons:
       - dbus-x11
       - xvfb
       - make
+      - jq                                # required by dist/build.sh
+#      - wine                              # ibid, for windows builds
       - g++
       - libnss3
       - libasound2
@@ -24,36 +26,42 @@ addons:
 
 env:
   global:
+    - DISPLAY=:99
     - API_HOST=172.17.0.1
     - REDIS_URL=redis://172.17.0.1:6379   # we'll pick up openwhisk's redis
-    - UV_THREADPOOL_SIZE=128
-    - NO_NOTIFICATIONS=true
-    - NO_DEBUGGER_BREAKPOINTS=true
-    - WINDOW_WIDTH=1400
-    - WINDOW_HEIGHT=1050
-    - KEY_FROM_LAYER=true
-    - DISPLAY=:99
+    - UV_THREADPOOL_SIZE=128              # might be superfluous; was trying to work around ESOCKETTIMEOUT on linux
+    - NO_NOTIFICATIONS=true               # try not to use Notifications in the browser
+    - WINDOW_WIDTH=1400                   # ! important ! so that clicks don't fail due to elements being off-viewport
+    - WINDOW_HEIGHT=1050                  # ! ibid !
+    - KEY_FROM_LAYER=true                 # use one api key per test layer
+    - TEST_FROM_BUILD="${TRAVIS_BUILD_DIR}/dist/build/IBM Cloud Shell-linux-x64/IBM Cloud Shell" # test against a specific dist build
 
 install:
-    - echo "API_HOST=foo" > ~/.wskprops                                                   # dist/compile.sh needs something here
-    - echo "AUTH=bar" >>  ~/.wskprops                                                     # ibid
+    - echo "APIHOST=foo" > ~/.wskprops                                                    # dist/compile.sh needs something here
+    - echo "AUTH=bar" >>  ~/.wskprops                                                     # ibid (see the call to initOW in openwhisk-core.js)
     - (cd app && npm install && cd ../tests && npm install && npm run _instrument) &      # app and tests npm install
     - (./tools/travis/setup.sh; ./tools/travis/build.sh; ./tools/travis/init_auth.sh) &   # initialize openwhisk and test docker
-    - wait
-    - Xvfb $DISPLAY -screen 0 ${WINDOW_WIDTH}x${WINDOW_HEIGHT}x24 -ac &
-    - sleep 5
-    - head -50 app/content/js/ui.js
-#    - rm .dockerignore
-#    - cp tools/travis/Dockerfile .
-#    - docker build -t shell-test .                                                       # initialize test docker image
+    - wait                                                                                # wait for the above &'d background processes
+    - Xvfb $DISPLAY -screen 0 ${WINDOW_WIDTH}x${WINDOW_HEIGHT}x24 -ac &                   # start virtual framebuffer process
+    - sleep 5                                                                             # wait a bit for it to come up
+    - echo "AUTH=bar" >>  ~/.wskprops                                                     # tools/travis/build.sh overrides this
+    - (cd dist && ./build.sh linux)                                                       # create a dist build to test against
+    # ^^^ for the dist build, notice that we build for all platforms, even
+    # though travis only needs linux; this is done purposefully, so as
+    # to test the dist build mechanism for all platforms
+    - echo "composer plugin version `cat app/plugins/modules/composer/package.json | jq --raw-output .version`" # log to travis just in case
+    - cat app/plugins/.pre-scanned  | jq .commandToPlugin                                                       # ibid
+    - cat app/plugins/.pre-scanned  | jq .overrides                                                             # ibid
+    - echo "install steps completed with success"
 
+# if for some reason we want to avoid the use of travis jobs:
 #script: (cd tests && npm run test)
 #script: (cd tests && ./bin/runLocal.sh 01 08 07 02 03 04 05)
 
 jobs:
   include:
-    - script: (cd tests && ./bin/runLocal.sh 01 08 02 05)
-      env: EXECUTING=01:08:02:05
+    - script: (cd tests && ./bin/runLocal.sh 01 08 02 05)        # test a couple of layers here, as they're all small
+      env: EXECUTING=01:08:02:05                                 # this env var will help us distinguish jobs in the travis console
     - script: (cd tests && ./bin/runLocal.sh 07)
       env: EXECUTING=07
     - script: (cd tests && ./bin/runLocal.sh 03)
diff --git a/app/content/js/plugins.js b/app/content/js/plugins.js
@@ -213,7 +213,10 @@ const loadPlugin = (route, pluginPath) => {
         // the /wsk/action/invoke command)
         for (let k in cmdToPlugin) {
             if (commandToPlugin[k]) {
+                debug('override', k, cmdToPlugin[k], commandToPlugin[k])
                 overrides[k] = cmdToPlugin[k]
+            } else {
+                debug('not override', k, cmdToPlugin[k])
             }
             commandToPlugin[k] = cmdToPlugin[k]
         }
diff --git a/app/content/js/repl.js b/app/content/js/repl.js
@@ -1081,7 +1081,8 @@ self.exec = (commandUntrimmed, execOptions) => {
             throw e
         }
 
-        console.error('catastrophic error in repl', e)
+        console.error('catastrophic error in repl')
+        console.error(e)
 
         const blockForError = block || ui.getCurrentProcessingBlock()
 
diff --git a/app/plugins/modules/plugin/lib/compile.js b/app/plugins/modules/plugin/lib/compile.js
@@ -109,7 +109,7 @@ const diff = ({commandToPlugin:before}, {commandToPlugin:after}, reverseDiff = f
  *
  */
 const uglify = modules => modules.flat.map(module => new Promise((resolve, reject) => {
-    if (!process.env.UGLIFY) resolve()
+    if (!process.env.UGLIFY) return resolve()
     debug('uglify %s', module.path)
 
     const src = path.join(__dirname, '..', '..', '..', module.path),
@@ -223,12 +223,17 @@ module.exports = (rootDir, externalOnly, cleanup = false, reverseDiff = false) =
     if (cleanup) {
         // copy the TMP originals back in place
         debug('cleanup')
-        Promise.all(require('../../../../content/js/plugins.js').scanForPlugins(TMP)
-            .map(pluginJsFile => {
-                const pluginRoot = path.join(__dirname, '..', '..', '..', '..'),
-                    originalLocation = path.join(pluginRoot, pluginJsFile)
-                return fs.copy(pluginJsFile, originalLocation)
-            })).then(()=>resolve()).catch(err=>reject(err))
+        return fs.exists('../../../../content/js/plugins.js')
+            .then(exists => {
+                if (exists) {
+                    return Promise.all(require('../../../../content/js/plugins.js').scanForPlugins(TMP)
+                                       .map(pluginJsFile => {
+                                           const pluginRoot = path.join(__dirname, '..', '..', '..', '..'),
+                                                 originalLocation = path.join(pluginRoot, pluginJsFile)
+                                           return fs.copy(pluginJsFile, originalLocation)
+                                       })).then(()=>resolve()).catch(err=>reject(err))
+                }
+            })
 
     } else {
         const pluginRoot = path.join(rootDir, 'plugins')       // pluginRoot points to the root of the modules subdir
diff --git a/app/plugins/package.json b/app/plugins/package.json
@@ -10,7 +10,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@shell/composer": "git://github.com/ibm-functions/shell-composer-plugin#0.5.0",
+    "@shell/composer": "git://github.com/ibm-functions/shell-composer-plugin#0.5.2",
     "@shell/local": "git://github.com/ibm-functions/shell-local-plugin",
     "@shell/wskflow": "git://github.com/ibm-functions/shell-wskflow-plugin",
     "archiver": "^2.1.1",
diff --git a/app/plugins/ui/commands/openwhisk-core.js b/app/plugins/ui/commands/openwhisk-core.js
@@ -110,6 +110,7 @@ const initOW = () => {
     debug('initOW done')
 }
 if (apiHost && auth) initOW()
+else console.error('skipping initOW', apiHost, auth)
 
 /** is a given entity type CRUDable? i.e. does it have get and update operations, and parameters and annotations properties? */
 const isCRUDable = {
diff --git a/dist/build.sh b/dist/build.sh
@@ -16,6 +16,16 @@ ICON_LINUX=`cat ../app/build/config.json | jq --raw-output .filesystemIcons.linu
 VERSION=`git rev-parse master`
 BUILDDIR=build
 
+# if we're running a test against a dist build, then we need to tell
+# electron-packager to keep around devDependencies
+if [ -n "${TEST_FROM_BUILD}" ]; then
+    NO_PRUNE=--no-prune
+    NO_INSTALLER=true
+else
+    # by default, we want to uglify the javascript
+    UGLIFY=true
+fi
+
 function init {
     # make the build directory
     if [ ! -d $BUILDDIR ]; then
@@ -30,7 +40,7 @@ function init {
     fi
 
     # assemble plugins
-    UGLIFY=true ./compile.js
+    ./compile.js
 
     # minify the css
     cp ../app/content/css/ui.css /tmp
@@ -47,7 +57,7 @@ function cleanup {
 
     cp /tmp/ui.css ../app/content/css/ui.css
 
-    UGLIFY=true ./compile.js cleanup
+    ./compile.js cleanup
 }
 
 function win32 {
@@ -127,6 +137,7 @@ function linux {
         ./node_modules/.bin/electron-packager \
 	    ../app \
 	    "${PRODUCT_NAME}" \
+            ${NO_PRUNE} \
 	    --asar=true \
             --build-version=$VERSION \
 	    --out=$BUILDDIR \
@@ -146,8 +157,4 @@ function linux {
 
 
 # line up the work
-init
-win32
-mac
-linux
-cleanup
+init && win32 && mac && linux && cleanup
diff --git a/tests/lib/common.js b/tests/lib/common.js
@@ -43,13 +43,21 @@ exports.before = (ctx, {fuzz, noApp=false}={}) => {
 
         if (!noApp) {
             const opts = {
-	        path: electron,
 	        env,
                 chromeDriverArgs: [ '--no-sandbox' ],
                 waitTimeout: process.env.TIMEOUT || 60000,
-	        args: [ appMain ]
             }
-            if (process.env.CHROMEDRIVER_PORT) {
+
+	    if (process.env.TEST_FROM_BUILD) {
+		console.log(`Using build-based assets: ${process.env.TEST_FROM_BUILD}`)
+		opts.path = process.env.TEST_FROM_BUILD
+	    } else {
+		console.log('Using filesystem-based assets')
+	        opts.path = electron      // this means spectron will use electron located in node_modules
+		opts.args = [ appMain ]   // in this mode, we need to specify the main.js to use
+	    }
+
+	    if (process.env.CHROMEDRIVER_PORT) {
                 opts.port = process.env.CHROMEDRIVER_PORT
             }
             if (process.env.WSKNG_NODE_DEBUG) {

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,10 @@ const loadPlugin = (route, pluginPath) => {`
`213`	`213`	`// the /wsk/action/invoke command)`
`214`	`214`	`for (let k in cmdToPlugin) {`
`215`	`215`	`if (commandToPlugin[k]) {`
	`216`	`+ debug('override', k, cmdToPlugin[k], commandToPlugin[k])`
`216`	`217`	`overrides[k] = cmdToPlugin[k]`
	`218`	`+ } else {`
	`219`	`+ debug('not override', k, cmdToPlugin[k])`
`217`	`220`	`}`
`218`	`221`	`commandToPlugin[k] = cmdToPlugin[k]`
`219`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1081,7 +1081,8 @@ self.exec = (commandUntrimmed, execOptions) => {`
`1081`	`1081`	`throw e`
`1082`	`1082`	`}`
`1083`	`1083`
`1084`		`- console.error('catastrophic error in repl', e)`
	`1084`	`+ console.error('catastrophic error in repl')`
	`1085`	`+ console.error(e)`
`1085`	`1086`
`1086`	`1087`	`const blockForError = block \|\| ui.getCurrentProcessingBlock()`
`1087`	`1088`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ const initOW = () => {`
`110`	`110`	`debug('initOW done')`
`111`	`111`	`}`
`112`	`112`	`if (apiHost && auth) initOW()`
	`113`	`+else console.error('skipping initOW', apiHost, auth)`
`113`	`114`
`114`	`115`	`/** is a given entity type CRUDable? i.e. does it have get and update operations, and parameters and annotations properties? */`
`115`	`116`	`const isCRUDable = {`