← Back to branch summary

~jorge/charms/precise/cinder/fix-README

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: james.page at ubuntu
  • Date: 2014-10-09 09:49:21 UTC
  • mfrom: (50.3.1 cinder)
  • Revision ID: james.page@ubuntu.com-20141009094921-q25jvulcpjkjjr3w
[coreycb,r=james-page,r=osci] Amulet test fixes

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 unit_tests
 
5
        @flake8 --exclude hooks/charmhelpers hooks unit_tests tests
6
6
        @charm proof
7
7
 
8
8
unit_test:
 
9
        @echo Starting unit tests...
9
10
        @$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage unit_tests
10
11
 
11
12
test:
12
13
        @echo Starting amulet deployment tests...
13
14
        #NOTE(beisner): can remove -v after bug 1320357 is fixed
14
15
        #   https://bugs.launchpad.net/amulet/+bug/1320357
15
 
        @juju test -v -p AMULET_HTTP_PROXY
 
16
        @juju test -v -p AMULET_HTTP_PROXY --timeout 900 \
 
17
        00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse
16
18
 
17
19
bin/charm_helpers_sync.py:
18
20
        @mkdir -p bin
21
23
 
22
24
sync: bin/charm_helpers_sync.py
23
25
        @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
24
 
        @charm-helper-sync -c charm-helpers-tests.yaml
 
26
        @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
25
27
 
26
28
publish: lint unit_test
27
29
        bzr push lp:charms/cinder