snapweb

Merge lp://staging/~sergiusens/snapweb/originNamespacesInconsistencies into lp://staging/~snappy-dev/snapweb/trunk

  1. originNamespacesInconsistencies
  2. Merge into trunk
Proposed by Sergio Schvezov
Status: Merged
Merged at revision: 126
Proposed branch: lp://staging/~sergiusens/snapweb/originNamespacesInconsistencies
Merge into: lp://staging/~snappy-dev/snapweb/trunk
Diff against target: 530 lines (+106/-76)
9 files modified
dependencies.tsv (+1/-1)
snappy/common_test.go (+7/-3)
snappy/converge.go (+42/-21)
snappy/converge_test.go (+39/-32)
snappy/handlers.go (+12/-12)
snappy/icon.go (+2/-2)
www/src/js/controllers/snaps.js (+2/-2)
www/src/js/models/snap.js (+0/-2)
www/src/js/views/snap-layout.js (+1/-1)
To merge this branch: bzr merge lp://staging/~sergiusens/snapweb/originNamespacesInconsistencies
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Review via email: mp+258438@code.staging.launchpad.net

Commit message

Using package types to determine the resource name (ID) as frameworks and oem packages installed locally contain no origin/namespace

Description of the change

After or in this MP you will need to add/use https://code.launchpad.net/~sergiusens/snappy/storeSnapType/+merge/258437 which means updating dependencies.tsv

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) :
review: Approve
Revision history for this message
Snappy Tarmac (snappydevtarmac) wrote :
Download full text (4.2 KiB)

The attempt to merge lp:~sergiusens/webdm/originNamespacesInconsistencies into lp:webdm failed. Below is the output from the failed tests.

Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/blakesmith/ar failed; trying to fetch newer version
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
update github.com/gorilla/mux failed; trying to fetch newer version
launchpad.net/snappy now at snappy_tarmac-20150506140221-gy35a67lv7tmc0nl
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
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
Building
Running tests from /tmp/tmp.uwBckxE9WO/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:41:40 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:41:40 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:41:40 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:41:40 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:41:40 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:41:40 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:41:40 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:41:40 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:41:40 Icon path for installed package cannot be set the icon does not exist

----------------------------------------------------------------------
FAIL: converge_test.go:215: MergeSuite.TestManyInstalledAndManyRemotesSomeInstalling

converge_test.go:248:
    c.Check(snaps[3].Status, Equals, webprogress.StatusInstalling)
... obtained webprogress.Status = "uninstalled"
... expected webprogress.Status = "installing"

2015/05/07 06:41:40 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:41:40 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:41:40 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:41:40 Icon path for installed package cannot be set the icon does not exist
WARNING: cannot create /tmp/chec...

Read more...

Revision history for this message
Snappy Tarmac (snappydevtarmac) wrote :
Download full text (107.3 KiB)

The attempt to merge lp:~sergiusens/webdm/originNamespacesInconsistencies into lp:webdm failed. Below is the output from the failed tests.

Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/blakesmith/ar failed; trying to fetch newer version
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
update github.com/gorilla/mux failed; trying to fetch newer version
launchpad.net/snappy now at snappy_tarmac-20150507103214-pgd90adryua6v6wi
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
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
Building
Obtaining npm dependencies

> spawn-sync@1.0.6 postinstall /tmp/tmp.SQmXGLE7JY/src/launchpad.net/webdm/node_modules/gulp-imagemin/node_modules/imagemin/node_modules/imagemin-pngquant/node_modules/pngquant-bin/node_modules/bin-wrapper/node_modules/bin-check/node_modules/spawn-sync
> node postinstall

> spawn-sync@1.0.6 postinstall /tmp/tmp.SQmXGLE7JY/src/launchpad.net/webdm/node_modules/gulp-imagemin/node_modules/imagemin/node_modules/imagemin-optipng/node_modules/optipng-bin/node_modules/bin-wrapper/node_modules/bin-check/node_modules/spawn-sync
> node postinstall

> spawn-sync@1.0.6 postinstall /tmp/tmp.SQmXGLE7JY/src/launchpad.net/webdm/node_modules/gulp-imagemin/node_modules/imagemin/node_modules/imagemin-gifsicle/node_modules/gifsicle/node_modules/bin-wrapper/node_modules/bin-check/node_modules/spawn-sync
> node postinstall

Running tests from /tmp/tmp.SQmXGLE7JY/src/launchpad.net/webdm
? launchpad.net/webdm/cmd/snappyd [no test files]
? launchpad.net/webdm/oem [no test files]
FAIL launchpad.net/webdm/snappy [build failed]
? launchpad.net/webdm/webprogress [no test files]

# 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
launchpa...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches