Merge into trunk : nobody-puts-baby-in-the-corner : Code : snapweb

Status:	Merged
Approved by:	John Lenton on 2015-05-07
Approved revision:	128
Merged at revision:	123
Proposed branch:	lp://staging/~stephen-stewart/snapweb/nobody-puts-baby-in-the-corner
Merge into:	lp://staging/~snappy-dev/snapweb/trunk
Diff against target:	181 lines (+29/-21) 6 files modified README.md (+0/-1) build.sh (+1/-1) gulpfile.js (+13/-13) karma.conf.js (+3/-3) package.json (+2/-2) run-checks (+10/-1)
To merge this branch:	bzr merge lp://staging/~stephen-stewart/snapweb/nobody-puts-baby-in-the-corner
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
John Lenton (community)		2015-05-07	Approve on 2015-05-07
Review via email: mp+258466@code.staging.launchpad.net

Commit message

move npm to project root, run js tests in run-checks, use phantomjs by default

Description of the change

based on this lp:~chipaca/webdm/www-tests
but bzr complained about criss cross merges

Revision history for this message

John Lenton (chipaca) wrote on 2015-05-07:

#

I can ignore those warnings.

review: Approve

Revision history for this message

Snappy Tarmac (snappydevtarmac) wrote on 2015-05-07:

#

Download full text (4.1 KiB)

The attempt to merge lp:~stephen-stewart/webdm/nobody-puts-baby-in-the-corner into lp:webdm failed. Below is the output from the failed tests.

Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/gorilla/mux failed; trying to fetch newer version
update github.com/juju/loggo failed; trying to fetch newer version
github.com/gorilla/mux now at e444e69cbd2e2e3e0749a2f3c717cec491552bbf
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/juju/loggo now at 4c7cbce140ca070eeb59a28f4bf9507e511711f9
update github.com/blakesmith/ar failed; trying to fetch newer version
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
update github.com/gorilla/context failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update gopkg.in/check.v1 failed; trying to fetch newer version
github.com/gorilla/context now at 50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
update launchpad.net/snappy failed; trying to fetch newer version
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
launchpad.net/snappy now at snappy_tarmac-20150506140221-gy35a67lv7tmc0nl
Building
Obtaining npm dependencies
Running tests from /tmp/tmp.AoOqxvSfIg/src/launchpad.net/webdm
? launchpad.net/webdm/cmd/snappyd [no test files]
? launchpad.net/webdm/oem [no test files]
=== RUN Test
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
WARNING: cannot create /tmp/check-7854551822259482610/1/badDataPath/icons
OK: 15 passed
--- PASS: Test (0.01 seconds)
PASS
coverage: 38.8% of statements
ok launchpad.net/webdm/snappy 0.014s coverage: 38.8% of statements
? launchpad.net/webdm/webprogress [no test files]
Running vet
Running lint
Running js unit tests (set JS_TESTER to over...

The attempt to merge lp:~stephen-stewart/webdm/nobody-puts-baby-in-the-corner into lp:webdm failed. Below is the output from the failed tests.

Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/gorilla/mux failed; trying to fetch newer version
update github.com/juju/loggo failed; trying to fetch newer version
github.com/gorilla/mux now at e444e69cbd2e2e3e0749a2f3c717cec491552bbf
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/juju/loggo now at 4c7cbce140ca070eeb59a28f4bf9507e511711f9
update github.com/blakesmith/ar failed; trying to fetch newer version
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
update github.com/gorilla/context failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update gopkg.in/check.v1 failed; trying to fetch newer version
github.com/gorilla/context now at 50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
update launchpad.net/snappy failed; trying to fetch newer version
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
launchpad.net/snappy now at snappy_tarmac-20150506140221-gy35a67lv7tmc0nl
Building
Obtaining npm dependencies
Running tests from /tmp/tmp.AoOqxvSfIg/src/launchpad.net/webdm
?   	launchpad.net/webdm/cmd/snappyd	[no test files]
?   	launchpad.net/webdm/oem	[no test files]
=== RUN Test
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
WARNING: cannot create /tmp/check-7854551822259482610/1/badDataPath/icons
OK: 15 passed
--- PASS: Test (0.01 seconds)
PASS
coverage: 38.8% of statements
ok  	launchpad.net/webdm/snappy	0.014s	coverage: 38.8% of statements
?   	launchpad.net/webdm/webprogress	[no test files]
Running vet
Running lint
Running js unit tests (set JS_TESTER to override)

# we always run in a fresh dir in tarmac
export GOPATH=$(mktemp -d)
trap 'rm -rf "$GOPATH"' EXIT

# this is a hack, but not sure tarmac is golang friendly
mkdir -p $GOPATH/src/launchpad.net/webdm
cp -a . $GOPATH/src/launchpad.net/webdm/
cd $GOPATH/src/launchpad.net/webdm

./run-checks
gopkg.in/yaml.v2
launchpad.net/webdm/oem
github.com/gorilla/context
github.com/gorilla/mux
github.com/mvo5/goconfigparser
github.com/blakesmith/ar
launchpad.net/snappy/helpers
launchpad.net/snappy/clickdeb
launchpad.net/snappy/coreconfig
github.com/juju/loggo
launchpad.net/snappy/logger
launchpad.net/snappy/partition
launchpad.net/snappy/policy
github.com/cheggaaa/pb
launchpad.net/snappy/progress
launchpad.net/snappy/release
launchpad.net/snappy/systemd
launchpad.net/snappy/snappy
launchpad.net/webdm/webprogress
launchpad.net/webdm/snappy
launchpad.net/webdm/cmd/snappyd
./run-checks: 38: ./run-checks: npm: not found
./run-checks: 61: ./run-checks: ./node_modules/karma/bin/karma: not found

snapweb

Merge lp://staging/~stephen-stewart/snapweb/nobody-puts-baby-in-the-corner into lp://staging/~snappy-dev/snapweb/trunk

Commit message

Description of the change

Preview Diff

Subscribers