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

Proposed by Sergio Schvezov
Status: Merged
Approved by: Leo Arias
Approved revision: 128
Merged at revision: 128
Proposed branch: lp://qastaging/~sergiusens/snapcraft/mercury
Merge into: lp://qastaging/~snappy-dev/snapcraft/core
Diff against target: 221 lines (+126/-16)
7 files modified
debian/control (+2/-0)
integration-tests/data/hg-branch/snapcraft.yaml (+6/-0)
integration-tests/data/hg-head/snapcraft.yaml (+5/-0)
integration-tests/data/hg-tag/snapcraft.yaml (+6/-0)
integration-tests/units/jobs.pxu (+51/-0)
snapcraft/__init__.py (+24/-0)
snapcraft/tests/test_base_plugin.py (+32/-16)
To merge this branch: bzr merge lp://qastaging/~sergiusens/snapcraft/mercury
Reviewer Review Type Date Requested Status
Leo Arias (community) reviewed, tested Approve
Michael Terry (community) Needs Fixing
Review via email: mp+267080@code.qastaging.launchpad.net

Commit message

Adding support for mercurial sources (includes debian/control dependency change).

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Running ./runtests.sh reveals some pep8 failures.

Also, you should expand the unit tests in snapcraft/tests/test_base_plugin.py for this.

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

> Running ./runtests.sh reveals some pep8 failures.

Fixed.

> Also, you should expand the unit tests in snapcraft/tests/test_base_plugin.py
> for this.

I expanded the unit tests to be on par with git (which is only checking for tag + branch)

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

El miércoles, 5 de agosto de 2015 15h'15:49 ART, Sergio Schvezov escribió:
>> Running ./runtests.sh reveals some pep8 failures.
>
> Fixed.
>
>> Also, you should expand the unit tests in
>> snapcraft/tests/test_base_plugin.py
>> for this.
>
> I expanded the unit tests to be on par with git (which is only
> checking for tag + branch)

The merge proposal should be now

--
Sent using Dekko from my Ubuntu device

Revision history for this message
Leo Arias (elopio) wrote :

Looks good. And all the code you added is covered by tests, so get yourself a smiley sticker.

review: Approve (reviewed, tested)
Revision history for this message
Leo Arias (elopio) wrote :

oh wait, holding the top-approval. I think that the mercurial dependency should be added as a package dependency.
Also, if you don't mention it on the commit message you'll get a grumpy ogra. A grumpier ogra ;)

128. By Sergio Schvezov

Adding a runtime dep for mercurial

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