Skip to content

Commit

Permalink
Migrate from Amulet to Zaza
Browse files Browse the repository at this point in the history
This patch migrate tests from Amulet to Zaza, and Python3 only.

func-test-pr: openstack-charmers/zaza-openstack-tests#55

Partial-Bug: 1828424

Change-Id: I4dacf33d3ab4dedbbe62a36b1b2ce5606e51d234
Signed-off-by: Joe Guo <guoqiao@gmail.com>
  • Loading branch information
guoqiao committed Sep 10, 2019
1 parent 77fab98 commit 339e8a2
Show file tree
Hide file tree
Showing 31 changed files with 603 additions and 1,136 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#!/usr/bin/make
PYTHON := /usr/bin/env python
PYTHON := /usr/bin/env python3

lint:
@tox -e pep8

test:
@echo Starting unit tests...
@tox -e py27
@tox -e py3

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

bin/charm_helpers_sync.py:
@mkdir -p bin
Expand Down
4 changes: 3 additions & 1 deletion scripts/glance-simplestreams-sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,9 @@ def main():
"message": "Sync starting."})
do_sync(charm_conf, status_exchange)
ts = time.strftime("%x %X")
completed_msg = "Sync completed at {}".format(ts)
# "Unit is ready" is one of approved message prefixes
# Prefix the message with it will help zaza to check.
completed_msg = "Unit is ready. Sync completed at {}".format(ts)
status_exchange.send_message({"status": "Done",
"message": completed_msg})
status_set('active', completed_msg)
Expand Down
27 changes: 4 additions & 23 deletions test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,29 +1,10 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
charm-tools>=2.4.4
requests>=2.18.4
coverage>=3.6
mock>=1.2
flake8>=2.2.4,<=2.4.1
stestr>=2.2.0
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'
python-ceilometerclient>=1.5.0
python-cinderclient>=1.4.0
python-glanceclient>=1.1.0
python-heatclient>=0.8.0
python-keystoneclient>=1.7.1
python-neutronclient>=3.1.0
python-novaclient>=2.30.1
python-openstackclient>=1.7.0
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'
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
9 changes: 0 additions & 9 deletions tests/README.md

This file was deleted.

263 changes: 0 additions & 263 deletions tests/basic_deployment.py

This file was deleted.

Loading

0 comments on commit 339e8a2

Please sign in to comment.