Skip to content

Commit

Permalink
Migrate tests to zaza
Browse files Browse the repository at this point in the history
Depends-On: openstack-charmers/zaza#93
Change-Id: I9a19960fdb239eb5a8d421f135285e89b8405267
  • Loading branch information
n-pochet committed Oct 9, 2018
1 parent 72b7a5b commit dd47f64
Show file tree
Hide file tree
Showing 25 changed files with 959 additions and 1,141 deletions.
5 changes: 2 additions & 3 deletions Makefile
Expand Up @@ -9,8 +9,8 @@ test:
@tox -e py27

functional_test:
@echo Starting Amulet tests...
@tox -e func27
@echo Starting Zaza functional tests...
@tox -e func

bin/charm_helpers_sync.py:
@mkdir -p bin
Expand All @@ -23,7 +23,6 @@ bin/git_sync.py:

ch-sync: bin/charm_helpers_sync.py
$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml

ceph-sync: bin/git_sync.py
$(PYTHON) bin/git_sync.py -d lib -s https://github.com/openstack/charms.ceph.git
Expand Down
7 changes: 0 additions & 7 deletions charm-helpers-tests.yaml

This file was deleted.

9 changes: 2 additions & 7 deletions test-requirements.txt
Expand Up @@ -6,11 +6,7 @@ coverage>=3.6
mock>=1.2
flake8>=2.2.4,<=2.4.1
os-testr>=0.4.1
requests>=2.18.4
# BEGIN: Amulet OpenStack Charm Helper Requirements
# Liberty client lower constraints
amulet>=1.14.3,<2.0;python_version=='2.7'
bundletester>=0.6.1,<1.0;python_version=='2.7'
requests==2.18.4
python-ceilometerclient>=1.5.0
python-cinderclient>=1.4.0
python-glanceclient>=1.1.0
Expand All @@ -23,7 +19,6 @@ python-swiftclient>=2.6.0
pika>=0.10.0,<1.0
distro-info
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
# END: Amulet OpenStack Charm Helper Requirements
# NOTE: workaround for 14.04 pip/tox
pytz
pyudev # for ceph-* charm unit tests (not mocked?)
git+https://github.com/openstack-charmers/zaza.git#egg=zaza;python_version>='3.0'
9 changes: 0 additions & 9 deletions tests/README.md

This file was deleted.

0 comments on commit dd47f64

Please sign in to comment.