Juju Charms Collection
landscape-client package

Merge lp://staging/~dpb/charms/trusty/landscape-client/fix-integration-tests into lp://staging/~landscape/charms/trusty/landscape-client/trunk

  1. Trusty Tahr (14.04)
  2. fix-integration-tests
  3. Merge into trunk
Proposed by David Britton
Status: Merged
Merged at revision: 50
Proposed branch: lp://staging/~dpb/charms/trusty/landscape-client/fix-integration-tests
Merge into: lp://staging/~landscape/charms/trusty/landscape-client/trunk
Diff against target: 532 lines (+127/-238)
15 files modified
.bzrignore (+2/-0)
TESTING (+17/-5)
config.yaml (+16/-0)
hooks/ceph.py (+1/-1)
hooks/install.py (+0/-1)
metadata.yaml (+1/-0)
tests/00-setup (+10/-0)
tests/001_install.test (+0/-95)
tests/10-deploy-register.py (+53/-0)
tests/Makefile (+0/-8)
tests/bundles.yaml (+20/-0)
tests/lib/test-config.yaml (+0/-8)
tests/lib/test-helpers.sh (+0/-114)
tests/test.sh (+0/-6)
tests/test.yaml (+7/-0)
To merge this branch: bzr merge lp://staging/~dpb/charms/trusty/landscape-client/fix-integration-tests
Reviewer Review Type Date Requested Status
Chad Smith Approve
Andreas Hasenack Approve
Review via email: mp+243882@code.staging.launchpad.net

Description of the change

Get our integration tests back up to snuff. You can test like:

virtualenv bundletester
source bundletester/bin/activate
pip install bundletester
juju env <where you want to be>
bundletester

FYI -- there is nothing fancy about bundletester, it's just a runner and what ~charmers is moving toward for standardized testing of charms/bundles. You can achieve the same functionality by doing this:

make test
make lint
charm proof
./test/00-*
./test/10-*

FYI 2 -- you can see the results of testing here:

https://ci.lscape.net/view/Landscape%20Client/job/landscape-client-charm-test/

To post a comment you must log in.
lp://staging/~dpb/charms/trusty/landscape-client/fix-integration-tests updated
53. By David Britton

add python-amulet to dependency list

54. By David Britton

change logic in 00-setup, add amulet to test.yaml (which I don't think is used, but the instructions say to update)

55. By David Britton

allow overriding origin, it was so small, I'm including it.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

A few comments inline. I'm not very fond of using staging as a test bed for this, but right now I don't have a better idea other than deploying lds for real, which is out of scope for this.

review: Approve
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

I wonder, however, if #is won't complain about us temporarily having root on whatever machine or container that is running this. This could be a big nono.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

If we proceed with staging as is, I'd suggest to create another admin there, with very strict permissions (i.e., only to reject computers), and use those credentials in the jenkins cleanup job.

Revision history for this message
David Britton (dpb) wrote :

> If we proceed with staging as is, I'd suggest to create another admin there,
> with very strict permissions (i.e., only to reject computers), and use those
> credentials in the jenkins cleanup job.

This part is done, thanks. Agreed that this is not the best approach (using staging), but other than deploying LDS alongside the client for the integration test (which would make it a much longer and more complicated process), I can't see another good option for actually testing it can register.

As we saw with the recent breakage, registering is the only way to test some of the recent juju-info integration stuff.

Revision history for this message
David Britton (dpb) :
lp://staging/~dpb/charms/trusty/landscape-client/fix-integration-tests updated
56. By David Britton

andreas[diff]: adding flake8, landscape-common, increasing timeouts

57. By David Britton

andreas[diff]: Added comment about how amulet works with charm:landscape-client

Revision history for this message
Chad Smith (chad.smith) wrote :

+1 on this branch with 2 minor comments.
Also we shouldn't have related the branch to lp:1399314 right? That bug is a landscape-server charm issue.

review: Approve
lp://staging/~dpb/charms/trusty/landscape-client/fix-integration-tests updated
58. By David Britton

remove mention of bundltester from TESTING.

59. By David Britton

blackboxsw[diff]: explination for env var added to 'TESTING'

60. By David Britton

blackboxsw[diff]: remove useless tail, add s to succes

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

to all changes: