← Back to branch summary

~openstack-charmers-archive/charms/trusty/percona-cluster/next

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Liam Young
  • Date: 2015-08-26 15:08:47 UTC
  • mfrom: (71.1.3 percona-cluster)
  • Revision ID: liam.young@canonical.com-20150826150847-t1mfmec311tbfvws
[1chb1n, r=gnuoy] Sync charm-helpers for liberty cloud archive support; Also update makefile, update c-h sync yaml, update tests dir, update amulet test dependencies - to be consistent with other os-charms. Clean up old existing lint in unit tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
3
3
export PYTHONPATH := hooks
4
4
 
5
5
lint:
6
 
        @flake8 --exclude hooks/charmhelpers hooks
 
6
        @flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
 
7
        hooks unit_tests tests
7
8
        @charm proof
8
9
 
9
 
unit_test:
10
 
        @$(PYTHON) /usr/bin/nosetests --nologcapture unit_tests
11
 
 
12
10
test:
 
11
        @# Bundletester expects unit tests here.
 
12
        @$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests
 
13
 
 
14
functional_test:
13
15
        @echo Starting amulet tests...
14
 
        #NOTE(beisner): can remove -v after bug 1320357 is fixed
15
 
        #   https://bugs.launchpad.net/amulet/+bug/1320357
16
16
        @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
17
 
        #echo "Tests disables; http://pad.lv/1446169"
18
17
 
19
18
bin/charm_helpers_sync.py:
20
19
        @mkdir -p bin
22
21
        > bin/charm_helpers_sync.py
23
22
 
24
23
sync: bin/charm_helpers_sync.py
25
 
        @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers.yaml
 
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
 
27
publish: lint test
29
28
        bzr push lp:charms/trusty/percona-cluster