← Back to branch summary

~1chb1n/charms/trusty/keystone/next-revert166

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: james.page at ubuntu
  • Date: 2015-07-07 13:59:13 UTC
  • mfrom: (156.1.3 keystone)
  • Revision ID: james.page@ubuntu.com-20150707135913-3vk4wvm8wlxz5whp
Update amulet tests for vivid and prep for wily; Sync tests/charmhelpers; 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 --nologcapture --with-coverage unit_tests
11
13
 
12
 
test:
 
14
functional_test:
13
15
        @echo Starting Amulet tests...
14
 
        # coreycb note: The -v should only be temporary until Amulet sends
15
 
        # raise_status() messages to stderr:
16
 
        #   https://bugs.launchpad.net/amulet/+bug/1320357
17
16
        @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
18
17
 
19
18
bin/charm_helpers_sync.py:
25
24
        @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
26
25
        @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
27
26
 
28
 
publish: lint unit_test
 
27
publish: lint test
29
28
        bzr push lp:charms/keystone
30
29
        bzr push lp:charms/trusty/keystone