← Back to branch summary

~openstack-charmers-next/charms/vivid/lxd/trunk

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Ryan Beisner
  • Date: 2016-02-19 16:47:00 UTC
  • mfrom: (49.1.21 trunk)
  • Revision ID: ryan.beisner@canonical.com-20160219164700-alxf2blxyyzc4d28
[1chb1n,r=rockstar]

Add initial amulet tests; update Makefile; add tests/charmhelpers and sync; add NotImplemented unit_tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
2
2
PYTHON := /usr/bin/env python
3
3
 
4
4
lint:
5
 
        @flake8 --exclude hooks/charmhelpers hooks
 
5
        @flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
 
6
        hooks unit_tests tests
6
7
        @charm proof
7
8
 
8
 
unit_test:
 
9
test:
 
10
        @# Bundletester expects unit tests here.
9
11
        @echo Starting unit tests...
10
 
        @$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage unit_tests
 
12
        @$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests
11
13
 
12
14
bin/charm_helpers_sync.py:
13
15
        @mkdir -p bin
16
18
 
17
19
sync: bin/charm_helpers_sync.py
18
20
        @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers.yaml
19
 
#       @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
 
21
        @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
20
22
 
21
 
test:
 
23
functional_test:
22
24
        @echo Starting Amulet tests...
23
 
        # coreycb note: The -v should only be temporary until Amulet sends
24
 
        # raise_status() messages to stderr:
25
 
        #   https://bugs.launchpad.net/amulet/+bug/1320357
 
25
        @tests/setup/00-setup
26
26
        @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
27
27
 
28
28
publish: lint unit_test
29
 
        bzr push lp:charms/nova-compute
30
 
        bzr push lp:charms/trusty/nova-compute
 
29
        bzr push lp:charms/lxd
 
30
        bzr push lp:charms/trusty/lxd