Snapcraft

Merge lp://qastaging/~sergiusens/snapcraft/icon-meta into lp://qastaging/~snappy-dev/snapcraft/core

icon-meta
Merge into core

Proposed by Sergio Schvezov on 2015-08-27

Status:	Merged
Approved by:	John Lenton on 2015-08-28
Approved revision:	155
Merged at revision:	143
Proposed branch:	lp://qastaging/~sergiusens/snapcraft/icon-meta
Merge into:	lp://qastaging/~snappy-dev/snapcraft/core
Prerequisite:	lp://qastaging/~sergiusens/snapcraft/testing-fixes
Diff against target:	739 lines (+101/-21) 32 files modified examples/godd/snapcraft.yaml (+1/-0) examples/gopaste/snapcraft.yaml (+1/-0) examples/java-hello-world/snapcraft.yaml (+1/-0) examples/libpipeline/snapcraft.yaml (+1/-0) examples/py2-project/snapcraft.yaml (+1/-0) examples/py3-project/snapcraft.yaml (+1/-0) examples/qmldemo/snapcraft.yaml (+1/-0) examples/tomcat-maven-webapp/snapcraft.yaml (+1/-0) examples/webcam-webui-snap/snapcraft.yaml (+1/-0) examples/wget-deb/snapcraft.yaml (+1/-0) integration-tests/data/assemble/snapcraft.yaml (+1/-0) integration-tests/data/bzr-head/snapcraft.yaml (+1/-0) integration-tests/data/bzr-tag/snapcraft.yaml (+1/-0) integration-tests/data/conflicts/snapcraft.yaml (+1/-0) integration-tests/data/dependencies/snapcraft.yaml (+1/-0) integration-tests/data/git-branch/snapcraft.yaml (+1/-0) integration-tests/data/git-head/snapcraft.yaml (+1/-0) integration-tests/data/git-tag/snapcraft.yaml (+1/-0) integration-tests/data/hg-branch/snapcraft.yaml (+1/-0) integration-tests/data/hg-head/snapcraft.yaml (+1/-0) integration-tests/data/hg-tag/snapcraft.yaml (+1/-0) integration-tests/data/local-plugin/snapcraft.yaml (+1/-0) integration-tests/data/local-source/snapcraft.yaml (+1/-0) integration-tests/data/simple-cmake/snapcraft.yaml (+1/-0) integration-tests/data/simple-copy/snapcraft.yaml (+1/-0) integration-tests/data/simple-make/snapcraft.yaml (+1/-0) integration-tests/data/simple-tar/snapcraft.yaml (+1/-0) schema/snapcraft.yaml (+5/-0) snapcraft/meta.py (+11/-0) snapcraft/tests/test_meta.py (+20/-8) snapcraft/tests/test_yaml.py (+30/-12) snapcraft/yaml.py (+8/-1)
To merge this branch:	bzr merge lp://qastaging/~sergiusens/snapcraft/icon-meta
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
John Lenton (community)		Approve on 2015-08-28
Leo Arias (community)	2015-08-27	Needs Fixing on 2015-08-27
Review via email: mp+269446@code.qastaging.launchpad.net

Commit message

icon support for snapcraft.yaml

lp://qastaging/~sergiusens/snapcraft/icon-meta updated on 2015-08-27

154. By Sergio Schvezov on 2015-08-27: oops moment

Revision history for this message

Leo Arias (elopio) wrote on 2015-08-27:

You forgot to add the icon.png files for the integration-tests. They all fail with:

Issues while validating snapcraft.yaml: 'icon.png' is not a 'icon-path'

And you are missing the assertion on the copy call:

+ icon_path = os.path.join(meta_dir, 'my-icon.png')
+ self.mock_copyfile.assert_called_once_with('my-icon.png', icon_path)

review: Needs Fixing

Revision history for this message

Sergio Schvezov (sergiusens) wrote on 2015-08-28:

doh, thanks, done

On Thu, Aug 27, 2015 at 7:51 PM, Leo Arias <email address hidden> wrote:

> Review: Needs Fixing
>
> You forgot to add the icon.png files for the integration-tests. They all
> fail with:
>
> Issues while validating snapcraft.yaml: 'icon.png' is not a 'icon-path'
>
> And you are missing the assertion on the copy call:
>
> + icon_path = os.path.join(meta_dir, 'my-icon.png')
> + self.mock_copyfile.assert_called_once_with('my-icon.png',
> icon_path)
>
> --
> https://code.launchpad.net/~sergiusens/snapcraft/icon-meta/+merge/269446
> You are the owner of lp:~sergiusens/snapcraft/icon-meta.
>
> Launchpad-Message-Rationale: Owner
> Launchpad-Notification-Type: code-review
> Launchpad-Branch: ~sergiusens/snapcraft/icon-meta
> Launchpad-Project: snapcraft
>