Merge charm-rsyslog-forwarder-ha:test_updates into charm-rsyslog-forwarder-ha:master

[Xav Paice]

Updates for functional and unit tests

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:2f3d1a3170c9a1dce352a671147e8ad9053d24f9
https://jenkins.canonical.com/bootstack/job/lp-charm-rsyslog-forwarder-ha-ci/6/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/400/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/836/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-rsyslog-forwarder-ha-ci/6//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:2f3d1a3170c9a1dce352a671147e8ad9053d24f9
https://jenkins.canonical.com/bootstack/job/lp-charm-rsyslog-forwarder-ha-ci/8/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/424/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/861/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-rsyslog-forwarder-ha-ci/8//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:2f3d1a3170c9a1dce352a671147e8ad9053d24f9
https://jenkins.canonical.com/bootstack/job/lp-charm-rsyslog-forwarder-ha-ci/11/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/441/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/877/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-rsyslog-forwarder-ha-ci/11//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:2f3d1a3170c9a1dce352a671147e8ad9053d24f9
https://jenkins.canonical.com/bootstack/job/lp-charm-rsyslog-forwarder-ha-ci/14/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/451/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/887/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-rsyslog-forwarder-ha-ci/14//rebuild

review: Approve (continuous-integration)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 5814822dd40da6890425c40bf6d0964052825b26

diff --git a/Makefile b/Makefile
index 7e1e684..f90149b 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ submodules-update:
 	@echo "Pulling latest updates for submodules"
 	@git submodule update --init --recursive --remote --merge
 
-build:
+build: submodules
 	@echo "Building charm to base directory ${CHARM_BUILD_DIR}/${CHARM_NAME}"
 	@-git rev-parse --abbrev-ref HEAD > ./repo-info
 	@-git describe --always > ./version
@@ -60,7 +60,7 @@ proof:
 	@echo "Running charm proof"
 	@-charm proof
 
-unittests:
+unittests: submodules
 	@echo "Running unit tests"
 	@tox -e unit
 
diff --git a/tests/functional/requirements.txt b/tests/functional/requirements.txt
index dd46e3c..1c85ef1 100644
--- a/tests/functional/requirements.txt
+++ b/tests/functional/requirements.txt
@@ -1,2 +1,3 @@
 # Functional test requirements
 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
+python-openstackclient
diff --git a/tests/functional/tests/tests.yaml b/tests/functional/tests/tests.yaml
index de5c1ff..3c16010 100644
--- a/tests/functional/tests/tests.yaml
+++ b/tests/functional/tests/tests.yaml
@@ -13,4 +13,5 @@ target_deploy_status:
   rsyslog-forwarder-ha:
     workload-status: unknown
     workload-status-message: ''
-
+  syslog-source:
+    workload-status-message: ''
diff --git a/tests/unit/requirements.txt b/tests/unit/requirements.txt
index ff80f62..f5436d2 100644
--- a/tests/unit/requirements.txt
+++ b/tests/unit/requirements.txt
@@ -4,3 +4,4 @@ PyYAML==3.10
 SQLAlchemy==0.9.4
 mock==1.0.1
 six
+charmhelpers
diff --git a/tox.ini b/tox.ini
index 2a46e3c..7848956 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,6 +19,16 @@ passenv =
   HTTP_PROXY
   HTTPS_PROXY
   NO_PROXY
+  OS_REGION_NAME
+  OS_AUTH_VERSION
+  OS_AUTH_URL
+  OS_PROJECT_DOMAIN_NAME
+  OS_USERNAME
+  OS_PASSWORD
+  OS_PROJECT_ID
+  OS_USER_DOMAIN_NAME
+  OS_PROJECT_NAME
+  OS_IDENTITY_API_VERSION
   SNAP_HTTP_PROXY
   SNAP_HTTPS_PROXY
 
@@ -64,5 +74,5 @@ deps = -r{toxinidir}/tests/unit/requirements.txt
 
 [testenv:func]
 changedir = {toxinidir}/tests/functional
-commands = functest-run-suite {posargs}
+commands = functest-run-suite --keep-faulty-model {posargs}
 deps = -r{toxinidir}/tests/functional/requirements.txt