Merge lp://staging/~jdstrand/click-reviewers-tools/click-reviewers-tools.snappy1604 into lp://staging/click-reviewers-tools
| Status: | Merged |
|---|---|
| Merged at revision: | 555 |
| Proposed branch: | lp://staging/~jdstrand/click-reviewers-tools/click-reviewers-tools.snappy1604 |
| Merge into: | lp://staging/click-reviewers-tools |
| Diff against target: |
3029 lines (+1432/-469) 23 files modified
check-names.list (+2/-6) clickreviews/cr_common.py (+82/-30) clickreviews/cr_content_hub.py (+4/-0) clickreviews/cr_desktop.py (+11/-4) clickreviews/cr_framework.py (+13/-11) clickreviews/cr_functional.py (+9/-10) clickreviews/cr_lint.py (+113/-109) clickreviews/cr_online_accounts.py (+10/-0) clickreviews/cr_push_helper.py (+7/-0) clickreviews/cr_scope.py (+4/-0) clickreviews/cr_security.py (+210/-104) clickreviews/cr_tests.py (+41/-1) clickreviews/cr_url_dispatcher.py (+4/-0) clickreviews/tests/test_cr_content_hub.py (+25/-0) clickreviews/tests/test_cr_desktop.py (+28/-0) clickreviews/tests/test_cr_lint.py (+386/-112) clickreviews/tests/test_cr_online_accounts.py (+24/-0) clickreviews/tests/test_cr_push_helper.py (+20/-0) clickreviews/tests/test_cr_scope.py (+24/-0) clickreviews/tests/test_cr_security.py (+334/-62) clickreviews/tests/test_cr_url_dispatcher.py (+24/-0) clickreviews/tests/utils.py (+28/-20) debian/changelog (+29/-0) |
| To merge this branch: | bzr merge lp://staging/~jdstrand/click-reviewers-tools/click-reviewers-tools.snappy1604 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jamie Strandboge (community) | Approve | ||
| Michael Vogt | Pending | ||
|
Review via email:
|
|||
Description of the change
This is a big branch to support all snaps and squashfs. In particular:
* add kernel and os as valid snap types
* remove package filename checks. They were meaningless and hard to maintain
* several changes for squashfs snaps that won't have a click manifest, etc.
Importantly, this means that only package.yaml is looked at and a lot of
click specific tests can be skipped
- cr_common.py:
+ rename a few variable to not be click specific
+ add self.pkgfmt
+ adjust __init__() to conditionally use package.yaml on squashfs,
otherwise click manifest
+ make click data structure initialization conditional on if click
or not (eg, don't run hooks code on squashfs images)
- adjust clickreviews/cr_* to conditionally run certain click-only tests
on click packages
- adjust architecture checks to use self.pkg_arch and rename
control_
- cr_security.py:
+ revamp to use package.yaml on non-click instead of now nonexistent
security manifest
+ update push-helper template test to not make hooks specific
+ network-client should not be allowed with push helpers either
+ conditionally look for INSTALL_DIR on 16.04 systems in security-policy
+ adjust security-override checks on 16.04 to follow 16.04 yaml
+ make click manifest checks conditional on if click
- cr_tests.py: mock _pkgfmt_type(), _pkgfmt_version() and _is_squashfs()
Testing consisted of:
* comparing the output of 'click-review -v' on all clicks in the store with trunk and with this branch
* comparing the output of 'click-review -v' on all non-squashfs snaps in the store with trunk and with this branch
* comparing the output of 'click-review -v' on hello-world.
* testing 'click-review -v' on all squashfs snaps
I don't necessarily expect people to go through this whole branch, but I wanted people to see it before committing. I'm going on holiday next week and will address feedback and pursue a store sync after that.
For those that want to test:
$ bzr branch lp:~jdstrand/click-reviewers-tools/click-reviewers-tools.snappy1604 review-tools
$ cd ./review-tools
$ PYTHONPATH=./ ./bin/click-review -v /path/to/app
Ok, this has not received reviews but is well tested. It is important that this land sooner rather than later so committing. Please ping me if there are any issues and I'll sort them out immediately.