summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorviswesn <viswesn@gmail.com>2016-11-15 18:05:52 +0530
committerviswesn <viswesn@gmail.com>2016-11-15 18:05:52 +0530
commit9a20c3e9d81360126af8e023635020b0ecda27e7 (patch)
tree89988e6b62fa5060d67f377a6f257f1815560558
parent349d107d6bb0549e03924ddba9bd0676671997e3 (diff)
downloadcharm-murano-9a20c3e9d81360126af8e023635020b0ecda27e7.zip
charm-murano-9a20c3e9d81360126af8e023635020b0ecda27e7.tar.gz
charm-murano-9a20c3e9d81360126af8e023635020b0ecda27e7.tar.bz2
Unit and functional testing updates
-rw-r--r--src/test-requirements.txt23
-rw-r--r--src/tox.ini92
-rw-r--r--test-requirements.txt13
3 files changed, 68 insertions, 60 deletions
diff --git a/src/test-requirements.txt b/src/test-requirements.txt
index 368dbf2..9d66a11 100644
--- a/src/test-requirements.txt
+++ b/src/test-requirements.txt
@@ -1,7 +1,16 @@
-# Lint and unit test requirements
-flake8
-os-testr>=0.4.1
-charms.reactive
-mock>=1.2
-coverage>=3.6
-git+https://github.com/openstack/charms.openstack.git#egg=charms-openstack
+# charm-proof
+charm-tools>=2.0.0
+# amulet deployment helpers
+bzr+lp:charm-helpers#egg=charmhelpers
+# BEGIN: Amulet OpenStack Charm Helper Requirements
+# Liberty client lower constraints
+amulet>=1.14.3,<2.0
+bundletester>=0.6.1,<1.0
+python-keystoneclient>=1.7.1,<2.0
+python-muranoclient>=0.8.3,<=0.9.0
+python-cinderclient>=1.4.0,<2.0
+python-heatclient>=0.8.0,<1.0
+python-novaclient>=2.30.1,<3.0
+pika>=0.10.0,<1.0
+distro-info
+# END: Amulet OpenStack Charm Helper Requirements \ No newline at end of file
diff --git a/src/tox.ini b/src/tox.ini
index 8b9f734..787cdff 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -1,47 +1,47 @@
-# Source charm: ./tox.ini
-# This file is managed centrally by release-tools and should not be modified
-# within individual charm repos.
-[tox]
-skipsdist = True
-envlist = pep8,py34,py35
-skip_missing_interpreters = True
-
-[testenv]
-setenv = VIRTUAL_ENV={envdir}
- PYTHONHASHSEED=0
- TERM=linux
- LAYER_PATH={toxinidir}/layers
- INTERFACE_PATH={toxinidir}/interfaces
- JUJU_REPOSITORY={toxinidir}/build
-passenv = http_proxy https_proxy
-install_command =
- pip install {opts} {packages}
-deps =
- -r{toxinidir}/requirements.txt
-
-[testenv:build]
-basepython = python2.7
-commands =
- charm-build --log-level DEBUG -o {toxinidir}/build src {posargs}
-
-[testenv:py34]
-basepython = python3.4
-deps = -r{toxinidir}/test-requirements.txt
-commands = ostestr {posargs}
-
-[testenv:py35]
-basepython = python3.5
-deps = -r{toxinidir}/test-requirements.txt
-commands = ostestr {posargs}
-
-[testenv:pep8]
-basepython = python2.7
-deps = -r{toxinidir}/test-requirements.txt
-commands = flake8 {posargs} src unit_tests
-
-[testenv:venv]
-commands = {posargs}
-
-[flake8]
-# E402 ignore necessary for path append before sys module import in actions
+# Source charm: ./tox.ini
+# This file is managed centrally by release-tools and should not be modified
+# within individual charm repos.
+[tox]
+skipsdist = True
+envlist = pep8,py34,py35
+skip_missing_interpreters = True
+
+[testenv]
+setenv = VIRTUAL_ENV={envdir}
+ PYTHONHASHSEED=0
+ TERM=linux
+ LAYER_PATH={toxinidir}/layers
+ INTERFACE_PATH={toxinidir}/interfaces
+ JUJU_REPOSITORY={toxinidir}/build
+passenv = http_proxy https_proxy
+install_command =
+ pip install {opts} {packages}
+deps =
+ -r{toxinidir}/requirements.txt
+
+[testenv:build]
+basepython = python2.7
+commands =
+ charm-build --log-level DEBUG -o {toxinidir}/build src {posargs}
+
+[testenv:py34]
+basepython = python3.4
+deps = -r{toxinidir}/test-requirements.txt
+commands = ostestr {posargs}
+
+[testenv:py35]
+basepython = python3.5
+deps = -r{toxinidir}/test-requirements.txt
+commands = ostestr {posargs}
+
+[testenv:pep8]
+basepython = python2.7
+deps = -r{toxinidir}/test-requirements.txt
+commands = flake8 {posargs} src unit_tests
+
+[testenv:venv]
+commands = {posargs}
+
+[flake8]
+# E402 ignore necessary for path append before sys module import in actions
ignore = E402 \ No newline at end of file
diff --git a/test-requirements.txt b/test-requirements.txt
index 368dbf2..9f03b45 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,6 @@
-# Lint and unit test requirements
-flake8
-os-testr>=0.4.1
-charms.reactive
-mock>=1.2
-coverage>=3.6
-git+https://github.com/openstack/charms.openstack.git#egg=charms-openstack
+# Lint and unit test requirements
+flake8
+os-testr>=0.4.1
+charms.reactive
+mock>=1.2
+git+https://github.com/openstack/charms.openstack.git#egg=charms-openstack

This mirror site include all the OpenStack related repositories under: openstack, openstack-dev and openstack-infra.

NOTE: All repositories are updated every one hour.

Usage

For Git Clone
 git clone http://git.trystack.cn/openstack/nova.git 
For DevStack

Add GIT_BASE, NOVNC_REPO and SPICE_REPO variables to local.conf file.

[[local|localrc]]

# use TryStack git mirror
GIT_BASE=http://git.trystack.cn
NOVNC_REPO=http://git.trystack.cn/kanaka/noVNC.git
SPICE_REPO=http://git.trystack.cn/git/spice/spice-html5.git