← Back to branch summary

~freyes/+junk/lp1387390

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Ryan Beisner
  • Date: 2015-10-06 15:21:42 UTC
  • mto: This revision was merged to the branch mainline in revision 169.
  • Revision ID: ryan.beisner@canonical.com-20151006152142-nqwjqlx4u5fju4ng
update makefile

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 actions hooks unit_tests tests
 
5
        @flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
 
6
        actions 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
 
13
 
 
14
functional_test:
 
15
        @echo Starting Amulet tests...
 
16
        @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
11
17
 
12
18
bin/charm_helpers_sync.py:
13
19
        @mkdir -p bin
18
24
        @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
19
25
        @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
20
26
 
21
 
test:
22
 
        @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
26
 
        @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
27
 
 
28
 
publish: lint unit_test
 
27
publish: lint test
29
28
        bzr push lp:charms/nova-compute
30
29
        bzr push lp:charms/trusty/nova-compute