Add licensing support #201

Merged
merged 1 commit into from Jan 6, 2016

Conversation

Projects
None yet
3 participants
Collaborator

sergiusens commented Jan 5, 2016

(Closes LP: #1527453)

integration_tests/test_license.py
+from testtools.matchers import (
+ DirExists,
+ FileExists,
+ FileContains,
@elopio

elopio Jan 5, 2016

Member

FileContains before FileExists, so it's alphabetical.

snapcraft/tests/test_meta.py
+ call('file.apparmor', os.path.join(self.meta_dir,
+ 'file.apparmor')),
+ call('file.seccomp', os.path.join(self.meta_dir,
+ 'file.seccomp')),
@elopio

elopio Jan 5, 2016

Member

These three calls are not related to the license. You can use mock.ANY instead, I think here we only care about the license call.

snapcraft/tests/test_meta.py
+ 'snap/bin/bash.wrapper'),
+ args=None, shebang=None,
+ ),
+ ])
@elopio

elopio Jan 5, 2016

Member

How is this assertion related to the license? You might be testing too much in this test, this seems to me like something to do in a separate test.

+
+ expected_message = "'license' is a dependency of 'license-version'"
+ self.assertEqual(raised.exception.message, expected_message,
+ msg=self.data)
@elopio

elopio Jan 5, 2016

Member

What about a scenario for version without agreement?

@sergiusens

sergiusens Jan 6, 2016

Collaborator

added def test_license_with_license_version(self):

Member

elopio commented Jan 5, 2016

You have here some files without the trailing new line. I think we should adopt the practice of ending all files with a new line.
Also I left some comments for discussion.

Collaborator

sergiusens commented Jan 6, 2016

@chipaca maybe you want to take a look.

Add licensing support
(Closes LP: #1527453)
Collaborator

sergiusens commented Jan 6, 2016

@elopio I think I gone through all your requests.

Member

chipaca commented Jan 6, 2016

👍

Member

elopio commented Jan 6, 2016

yes, thanks, 👍

sergiusens added a commit that referenced this pull request Jan 6, 2016

@sergiusens sergiusens merged commit 1d5c2a4 into snapcore:master Jan 6, 2016

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.1%) to 88.873%
Details

@sergiusens sergiusens deleted the sergiusens:license-support branch Jan 6, 2016

smoser pushed a commit to smoser/snapcraft that referenced this pull request Sep 14, 2016

Merge pull request #201 from Azure/revert-200-2.1_selfupdate
Revert "Separate provision agent and guest agent"

kalikiana pushed a commit to kalikiana/snapcraft that referenced this pull request Apr 6, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment