Merge lp:~james-page/charms/trusty/rabbitmq-server/tox-switchover into lp:~openstack-charmers-archive/charms/trusty/rabbitmq-server/next

[James Page]

[lp:~james-page/charms/trusty/rabbitmq-server/tox-switchover]

133. By James Page on 2016-02-16

Further makefile tidy

[Liam Young (gnuoy)]

LGTM but I'd like to make sure that the osci initiated tests work

review: Approve

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #566 rabbitmq-server-next for james-page mp286139
    UNIT FAIL: unit-test missing

UNIT Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full unit test output: http://paste.ubuntu.com/15089617/
Build: http://10.245.162.36:8080/job/charm_unit_test/566/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #655 rabbitmq-server-next for james-page mp286139
    LINT FAIL: lint-test missing

LINT Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full lint test output: http://paste.ubuntu.com/15089618/
Build: http://10.245.162.36:8080/job/charm_lint_check/655/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #262 rabbitmq-server-next for james-page mp286139
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
2016-02-16 11:36:04,819 publish_amqp_message_by_unit DEBUG: Publishing message...
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15090573/
Build: http://10.245.162.36:8080/job/charm_amulet_test/262/

[Ryan Beisner (1chb1n)]

FYI, adjusting automation to be tox aware, will re-trigger unit and lint.

RE: amulet, one of the rmq units never reached "ready" state, will also retrigger.

rabbitmq-server/2 maintenance executing 1.25.3 6 5671/tcp,5672/tcp 172.17.104.67 (config-changed) Random wait for restart to avoid collisions

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #567 rabbitmq-server-next for james-page mp286139
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/567/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #657 rabbitmq-server-next for james-page mp286139
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/657/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #263 rabbitmq-server-next for james-page mp286139
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
2016-02-16 15:11:51,342 connect_amqp_by_unit DEBUG: Connecting to amqp on 172.17.105.185:5672 (rabbitmq-server/0) as testuser1...
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15092486/
Build: http://10.245.162.36:8080/job/charm_amulet_test/263/

[Ryan Beisner (1chb1n)]

I think your test is hitting this. It's definitely unrelated to the proposed changes.

https://bugs.launchpad.net/charms/+source/rabbitmq-server/+bug/1546255

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2015-01-23 08:23:05 +0000
+++ .bzrignore	2016-02-16 07:58:06 +0000
@@ -2,3 +2,5 @@
 revision
 .coverage
 .venv
+.tox
+.testrepository

=== added file '.testr.conf'
--- .testr.conf	1970-01-01 00:00:00 +0000
+++ .testr.conf	2016-02-16 07:58:06 +0000
@@ -0,0 +1,8 @@
+[DEFAULT]
+test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
+             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
+             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
+             ${PYTHON:-python} -m subunit.run discover -t ./ ./unit_tests $LISTOPT $IDOPTION
+
+test_id_option=--load-list $IDFILE
+test_list_option=--list

=== modified file 'Makefile'
--- Makefile	2015-10-21 13:36:00 +0000
+++ Makefile	2016-02-16 07:58:06 +0000
@@ -5,20 +5,11 @@
 TEST_PREFIX := PYTHONPATH=$(HOOKS_DIR)
 
 clean:
-	rm -f .coverage
+	rm -f .coverage .testrepository
 	find . -name '*.pyc' -delete
-	rm -rf .venv
-	(which dh_clean && dh_clean) || true
-
-.venv:
-	sudo apt-get install -y gcc python-dev python-virtualenv python-apt
-	virtualenv .venv --system-site-packages
-	.venv/bin/pip install -I -r test-requirements.txt
-
-lint: .venv
-	@.venv/bin/flake8 --exclude hooks/charmhelpers,tests/charmhelpers hooks \
-        unit_tests tests
-	@charm proof
+
+lint:
+	tox -e pep8
 
 bin/charm_helpers_sync.py:
 	@mkdir -p bin
@@ -33,10 +24,8 @@
 	bzr push lp:charms/rabbitmq-server
 	bzr push lp:charms/trusty/rabbitmq-server
 
-test: .venv
-	@echo Starting tests...
-	env CHARM_DIR=$(CHARM_DIR) $(TEST_PREFIX) .venv/bin/nosetests \
-        -v --nologcapture --with-coverage unit_tests/
+test:
+	tox -e py27
 
 functional_test:
 	@echo Starting amulet tests...

=== added file 'requirements.txt'
--- requirements.txt	1970-01-01 00:00:00 +0000
+++ requirements.txt	2016-02-16 07:58:06 +0000
@@ -0,0 +1,12 @@
+# 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.
+PyYAML>=3.1.0
+simplejson>=2.2.0
+netifaces>=0.10.4
+netaddr>=0.7.12,!=0.7.16
+Jinja2>=2.6  # BSD License (3 clause)
+six>=1.9.0
+dnspython>=1.12.0
+psutil>=1.1.1,<2.0.0
+python-neutronclient>=2.6.0

=== modified file 'test-requirements.txt'
--- test-requirements.txt	2015-01-23 09:01:50 +0000
+++ test-requirements.txt	2016-02-16 07:58:06 +0000
@@ -1,5 +1,8 @@
-nose
-testtools
-mock
-coverage
-flake8
+# 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.
+coverage>=3.6
+mock>=1.2
+flake8>=2.2.4,<=2.4.1
+os-testr>=0.4.1
+charm-tools

=== added file 'tox.ini'
--- tox.ini	1970-01-01 00:00:00 +0000
+++ tox.ini	2016-02-16 07:58:06 +0000
@@ -0,0 +1,29 @@
+[tox]
+envlist = pep8,py27
+skipsdist = True
+
+[testenv]
+setenv = VIRTUAL_ENV={envdir}
+         PYTHONHASHSEED=0
+install_command =
+  pip install --allow-unverified python-apt {opts} {packages}
+commands = ostestr {posargs}
+
+[testenv:py27]
+basepython = python2.7
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+
+[testenv:pep8]
+basepython = python2.7
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+commands = flake8 {posargs} hooks unit_tests tests
+           charm proof
+
+[testenv:venv]
+commands = {posargs}
+
+[flake8]
+ignore = E402,E226
+exclude = hooks/charmhelpers

=== modified file 'unit_tests/__init__.py'
--- unit_tests/__init__.py	2014-10-08 15:57:57 +0000
+++ unit_tests/__init__.py	2016-02-16 07:58:06 +0000
@@ -0,0 +1,3 @@
+import sys
+
+sys.path.append('hooks/')

=== modified file 'unit_tests/test_rabbitmq_server_relations.py'
--- unit_tests/test_rabbitmq_server_relations.py	2015-10-19 03:33:39 +0000
+++ unit_tests/test_rabbitmq_server_relations.py	2016-02-16 07:58:06 +0000
@@ -1,6 +1,6 @@
 import os
 from testtools import TestCase
-from mock import patch, MagicMock
+from mock import patch
 
 os.environ['JUJU_UNIT_NAME'] = 'UNIT_TEST/0'  # noqa - needed for import
 import rabbitmq_server_relations
@@ -11,31 +11,11 @@
         self.fake_repo = {}
         super(RelationUtil, self).setUp()
 
-    def _apt_cache(self):
-        """Used for mocking out apt_pkg.Cache"""
-        # mocks out the apt cache
-        def cache_get(package):
-            pkg = MagicMock()
-            if package in self.fake_repo \
-                    and 'pkg_vers' in self.fake_repo[package]:
-                pkg.name = package
-                pkg.current_ver.ver_str = self.fake_repo[package]['pkg_vers']
-            elif (package in self.fake_repo and
-                  'pkg_vers' not in self.fake_repo[package]):
-                pkg.name = package
-                pkg.current_ver = None
-            else:
-                raise KeyError
-            return pkg
-        cache = MagicMock()
-        cache.__getitem__.side_effect = cache_get
-        return cache
-
     @patch('rabbitmq_server_relations.peer_store_and_set')
     @patch('rabbitmq_server_relations.get_ipv6_addr')
     @patch('rabbitmq_server_relations.config')
     @patch('rabbitmq_server_relations.relation_set')
-    @patch('apt_pkg.Cache')
+    @patch('rabbitmq_server_relations.cmp_pkgrevno')
     @patch('rabbitmq_server_relations.is_clustered')
     @patch('rabbitmq_server_relations.ssl_utils.configure_client_ssl')
     @patch('rabbitmq_server_relations.unit_get')
@@ -44,7 +24,7 @@
     def test_amqp_changed_compare_versions_ha_queues(
             self,
             is_elected_leader, relation_get, unit_get, configure_client_ssl,
-            is_clustered, apt_cache, relation_set, mock_config,
+            is_clustered, cmp_pkgrevno, relation_set, mock_config,
             mock_get_ipv6_addr, mock_peer_store_and_set):
         """
         Compare version above and below 3.0.1.
@@ -64,9 +44,8 @@
         is_elected_leader.return_value = True
         relation_get.return_value = {}
         is_clustered.return_value = False
-        apt_cache.return_value = self._apt_cache()
+        cmp_pkgrevno.return_value = -1
 
-        self.fake_repo = {'rabbitmq-server': {'pkg_vers': '3.0'}}
         rabbitmq_server_relations.amqp_changed(None, None)
         mock_peer_store_and_set.assert_called_with(
             relation_settings={'private-address': '10.1.2.3',
@@ -74,7 +53,7 @@
                                'ha_queues': True},
             relation_id=None)
 
-        self.fake_repo = {'rabbitmq-server': {'pkg_vers': '3.0.2'}}
+        cmp_pkgrevno.return_value = 1
         rabbitmq_server_relations.amqp_changed(None, None)
         mock_peer_store_and_set.assert_called_with(
             relation_settings={'private-address': '10.1.2.3',
@@ -85,7 +64,7 @@
     @patch('rabbitmq_server_relations.get_ipv6_addr')
     @patch('rabbitmq_server_relations.config')
     @patch('rabbitmq_server_relations.relation_set')
-    @patch('apt_pkg.Cache')
+    @patch('rabbitmq_server_relations.cmp_pkgrevno')
     @patch('rabbitmq_server_relations.is_clustered')
     @patch('rabbitmq_server_relations.ssl_utils.configure_client_ssl')
     @patch('rabbitmq_server_relations.unit_get')
@@ -94,7 +73,7 @@
     def test_amqp_changed_compare_versions_ha_queues_prefer_ipv6(
             self,
             is_elected_leader, relation_get, unit_get, configure_client_ssl,
-            is_clustered, apt_cache, relation_set, mock_config,
+            is_clustered, cmp_pkgrevno, relation_set, mock_config,
             mock_get_ipv6_addr, mock_peer_store_and_set):
         """
         Compare version above and below 3.0.1.
@@ -115,16 +94,15 @@
         is_elected_leader.return_value = True
         relation_get.return_value = {}
         is_clustered.return_value = False
-        apt_cache.return_value = self._apt_cache()
+        cmp_pkgrevno.return_value = -1
 
-        self.fake_repo = {'rabbitmq-server': {'pkg_vers': '3.0'}}
         rabbitmq_server_relations.amqp_changed(None, None)
         mock_peer_store_and_set.assert_called_with(
             relation_settings={'private-address': ipv6_addr,
                                'ha_queues': True},
             relation_id=None)
 
-        self.fake_repo = {'rabbitmq-server': {'pkg_vers': '3.0.2'}}
+        cmp_pkgrevno.return_value = 1
         rabbitmq_server_relations.amqp_changed(None, None)
         mock_peer_store_and_set.assert_called_with(
             relation_settings={'private-address': ipv6_addr},