Graylog Charm

Merge ~mthaddon/charm-graylog/+git/graylog-charm:lxc-tests into ~graylog-charmers/charm-graylog:master

Git
lp:~mthaddon/charm-graylog/+git/graylog-charm
lxc-tests
Merge into master

Proposed by Tom Haddon on 2018-04-12

Status:	Rejected
Rejected by:	Tom Haddon on 2018-04-13
Proposed branch:	~mthaddon/charm-graylog/+git/graylog-charm:lxc-tests
Merge into:	~graylog-charmers/charm-graylog:master
Diff against target:	391 lines (+322/-3) (has conflicts) 7 files modified Makefile (+31/-3) scripts/lxc-tests (+109/-0) tests/10-basic.py (+3/-0) tests/20-clustered.py (+3/-0) tests/test_basic.py (+94/-0) tests/test_clustered.py (+76/-0) tests/tests.yaml (+6/-0) Conflict in Makefile Conflict in tests/10-basic.py Conflict in tests/20-clustered.py Conflict in tests/tests.yaml
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Kevin W Monroe		2018-04-12	Pending
Review via email: mp+343075@code.staging.launchpad.net

Commit message

Add a script to run functional tests inside LXC

Description of the change

Add a script to run functional tests inside LXC

Revision history for this message

🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote on 2018-04-12:

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message

Tom Haddon (mthaddon) wrote on 2018-04-12:

Have had some discussions with stub about this.

Changes we'd like to see:

- Move dependencies install to a "make testdeps" target, and call that from inside the LXC. This means if people want to install the dependencies and run the tests outside of LXC they can more easily do so.
- Default to running tests against the directory we're currently in (i.e. they graylog charm we're editing on disk). We'll need to copy the charm into the LXC, and then run "charm build", as tests will need to be run against the built charm, but this will mean we can run tests against the source branch of a charm which we believe is a nicer approach.

I'll work on implementing and testing those changes.

Revision history for this message

Stuart Bishop (stub) wrote on 2018-04-13:

Lots of inline comments

Revision history for this message

Tom Haddon (mthaddon) wrote on 2018-04-13:

Now tracking in https://code.launchpad.net/~mthaddon/graylog-charm/+git/graylog-charm/+merge/343234