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

Proposed by Sergio Schvezov
Status: Merged
Approved by: Sergio Schvezov
Approved revision: no longer in the source branch.
Merged at revision: 167
Proposed branch: lp://qastaging/~sergiusens/snapcraft/wiki
Merge into: lp://qastaging/~snappy-dev/snapcraft/core
Diff against target: 271 lines (+182/-1)
8 files modified
examples/downloader-with-wiki-parts/Makefile (+11/-0)
examples/downloader-with-wiki-parts/snapcraft.yaml (+15/-0)
examples/downloader-with-wiki-parts/test.c (+17/-0)
runtests.sh (+1/-1)
snapcraft/tests/test_wiki.py (+50/-0)
snapcraft/tests/test_yaml.py (+31/-0)
snapcraft/wiki.py (+50/-0)
snapcraft/yaml.py (+7/-0)
To merge this branch: bzr merge lp://qastaging/~sergiusens/snapcraft/wiki
Reviewer Review Type Date Requested Status
Sergio Schvezov Approve
John Lenton (community) Approve
Daniel Holbach (community) Approve
Review via email: mp+271140@code.qastaging.launchpad.net

Commit message

Try to use wiki when after in part is not local

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

A few small things:
 - examples/downloader-with-wiki-parts/icon.png is missing
 - "curl based downloaded" → "curl based downloader"?

I wasn't part of the design decisions regarding the wiki plugin, but I'm not quite sure how we could safe-guard against tampering of wiki pages. Do we want to look up who made the last edit of the page or something like that or introduce some kind of other security measure?

review: Needs Fixing
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

> A few small things:
> - examples/downloader-with-wiki-parts/icon.png is missing

ah, always forget to bzr add :-) (I also added test_wiki.py)

> - "curl based downloaded" → "curl based downloader"?
>
> I wasn't part of the design decisions regarding the wiki plugin, but I'm not
> quite sure how we could safe-guard against tampering of wiki pages. Do we want
> to look up who made the last edit of the page or something like that or
> introduce some kind of other security measure?

The idea was to lock down the wiki endpoint to specific people only.

Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work!

review: Approve
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

Taking advantage of community reviewers due to the high load.

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

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

The project has gotten complex.
Here's the list of units exceeding 10:
- snapcraft/cmds.py:
  246:1: 'cmd' 12

cp --preserve=all -R zzz /tmp/tmpsetsbpul/parts/copy/install/zzz
cp --preserve=all -R src /tmp/tmpq0hhcvas/parts/copy/install/dst
cp --preserve=all -R src /tmp/tmpuu5cjsbn/parts/copy/install/dir/dst

.........E...................Warning: unable to find "test_relexepath" in the path
..........................................EE
======================================================================
ERROR: snapcraft.tests.test_cmds (unittest.loader.ModuleImportFailure)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python3.4/unittest/case.py", line 57, in testPartExecutor
    yield
  File "/usr/lib/python3.4/unittest/case.py", line 574, in run
    testMethod()
  File "/usr/lib/python3.4/unittest/loader.py", line 32, in testFailure
    raise exception
ImportError: Failed to import test module: snapcraft.tests.test_cmds
Traceback (most recent call last):
  File "/usr/lib/python3.4/unittest/loader.py", line 312, in _find_tests
    module = self._get_module_from_name(name)
  File "/usr/lib/python3.4/unittest/loader.py", line 290, in _get_module_from_name
    __import__(name)
  File "/tmp/tarmac/branch.9LlwxZ/snapcraft/tests/test_cmds.py", line 24, in <module>
    from snapcraft import (
  File "/tmp/tarmac/branch.9LlwxZ/snapcraft/cmds.py", line 27, in <module>
    import snapcraft.yaml
  File "/tmp/tarmac/branch.9LlwxZ/snapcraft/yaml.py", line 25, in <module>
    import snapcraft.wiki
  File "/tmp/tarmac/branch.9LlwxZ/snapcraft/wiki.py", line 18, in <module>
    import requests
ImportError: No module named 'requests'

======================================================================
ERROR: snapcraft.tests.test_wiki (unittest.loader.ModuleImportFailure)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python3.4/unittest/case.py", line 57, in testPartExecutor
    yield
  File "/usr/lib/python3.4/unittest/case.py", line 574, in run
    testMethod()
  File "/usr/lib/python3.4/unittest/loader.py", line 32, in testFailure
    raise exception
ImportError: Failed to import test module: snapcraft.tests.test_wiki
Traceback (most recent call last):
  File "/usr/lib/python3.4/unittest/loader.py", line 312, in _find_tests
    module = self._get_module_from_name(name)
  File "/usr/lib/python3.4/unittest/loader.py", line 290, in _get_module_from_name
    __import__(name)
  File "/tmp/tarmac/branch.9LlwxZ/snapcraft/tests/test_wiki.py", line 19, in <module>
    import snapcraft.wiki
  File "/tmp/tarmac/branch.9LlwxZ/snapcraft/wiki.py", line 18, in <module>
    import requests
ImportError: No module named 'requests'

======================================================================
ERROR: snapcraft.tests.test_yaml (unittest.loader.ModuleImportFailure)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/li...

Read more...

Revision history for this message
John Lenton (chipaca) :
Revision history for this message
John Lenton (chipaca) :
review: Approve
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

after review (and tarmac now has python3-requests)

review: Approve
167. By Sergio Schvezov

Try to use wiki when after in part is not local by sergiusens approved by sergiusens,chipaca,dholbach

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