# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kos.tsakalozos@canonical.com-20161026141537-\
#   5u497awz8ja3msvq
# target_branch: http://bazaar.launchpad.net/~charmers/charms/trusty\
#   /haproxy/trunk/
# testament_sha1: 381f7de048e3d4c38989b8ae29a559a94f5ba1f3
# timestamp: 2016-10-26 14:15:52 +0000
# message: Fixes on tests
# base_revision_id: charles.butler@canonical.com-20160721174945-\
#   hnn6qupm2oxsl6fz
# 
# Begin patch
=== modified file 'Makefile'
--- Makefile	2015-11-19 18:13:43 +0000
+++ Makefile	2016-10-26 14:15:37 +0000
@@ -14,7 +14,7 @@
 	@charm proof
 
 .venv:
-	sudo apt-get install -y python-apt python-virtualenv python-jinja2 python-mock python-yaml python-testtools python-nose python-yaml python-flake8
+	sudo apt-get install -y flake8 python-apt python-virtualenv python-jinja2 python-mock python-yaml python-testtools python-nose python-yaml python-flake8
 	virtualenv .venv --system-site-packages
 	.venv/bin/pip install bundletester
 
@@ -24,7 +24,7 @@
 
 lint: .venv
 	@echo Checking for Python syntax...
-	@flake8 $(HOOKS_DIR) --ignore=E123 --exclude=$(HOOKS_DIR)/charmhelpers
+	@python -m flake8 $(HOOKS_DIR) --ignore=E123 --exclude=$(HOOKS_DIR)/charmhelpers
 
 sourcedeps: $(PWD)/config-manager.txt
 	@echo Updating source dependencies...

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2016-07-07 20:04:06 +0000
+++ hooks/hooks.py	2016-10-26 14:15:37 +0000
@@ -1277,7 +1277,7 @@
     # Set the umask so the child process will inherit it and we
     # can make certificate files readable only by the 'haproxy'
     # user (see below).
-    old_mask = os.umask(077)
+    old_mask = os.umask(0o077)
     with open(path, 'w') as f:
         f.write(content)
     os.umask(old_mask)

=== modified file 'tests/12_deploy_test_xenial.py'
--- tests/12_deploy_test_xenial.py	2016-07-07 20:04:06 +0000
+++ tests/12_deploy_test_xenial.py	2016-10-26 14:15:37 +0000
@@ -12,7 +12,7 @@
 d = amulet.Deployment(series='xenial')
 # Add the haproxy charm to the deployment.
 d.add('haproxy')
-d.add('apache2', 'cs:trusty/apache2', units=2)
+d.add('apache2', 'cs:trusty/apache2', units=2, series='trusty')
 
 # Get the directory this way to load the file when CWD is different.
 path = os.path.abspath(os.path.dirname(__file__))

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTmGndYAAtffgEAwVOf/91dq
nAC////wUAX5L1cmRSucdnHVB10CSQppNpp6o08T1R6Q00aZNqADIyA0CSpkm1NT9FNmiAnoygaA
GagaAaAkgkBNE8jKj0jT1HqD9UAAaaNABzAJpgEyGAAJgmAAACSTUxABEwNJ6TVPKe0U9MU2oAA9
REG035Y9OBp2wuymlv3K7YRR+NV2xIqYVDZ0s3GLaPS6K9yeNJvv+3ZmvetqZmZmZE9YH4m1lkxy
ZmdodxhpZnD2JbGlqIjbd0ze0Zlo+nLir/OWL97BRvBZucJ1XCXievHPwkIQmyLg2yqSgySyNPOZ
4QlT1EL2ejWOna4bTvf428GOA89oyS5kmAh/Sznf5rUmKPg36ahsfwMFDOcB7N2K6ICok7sJZ0qP
V5Pkn5yQcGC9k7vy6G0MzGmMcQ5HkLIDY9kIQ5mMIg3S5BdI/ovCRaEF40kiJgbhwkmatRMC060e
UvDvLThrNMQmxJhDXfsmHiG5rSuiYhUpcEj5DQeTHFCYRvpx7ZRzh5IQlzZnOaioRUOIq2s3wwmG
VIZI1AZHIokMdiw+LqjSolUxguSnkRXCo3GhkSzxLIVcD03hQgWCIjpjYDlVriIDlY0LrXN11Rro
QPqsI4PNkjEub6XEGA8bidDqHrLi4kRYRIxwJcrk0rL7dwiCkYwnyKmdyB0ZMIs1MdlxaQP8Jljk
U5cNiMMbi93hM1B8iI6mmGCgZKostKOAwjTfM5Gu8qxgZFUpjm8Rc8YQJjgSXZ8uIsEZ3uehXA02
EzM2QMzlNSL70YDD4MSvOtTbfazZnFCsvDSXQbh6lv55FdbaXsvL0ZI30mWfXiIjjwnaWn1JUaGw
uhIYhbErHesok5X3TKxnJUvLDaVMEy8sOQjuLt1JcOYV0WqWzsJDHJypNU4jEq6DmWFpvLyDC18X
e9kRwHbC16omZCEENJohMUpt9PgMi7DFlYzECDaJlBTG5eS8XoMyZI1UQZmGTNbuLX9PabD8Hxcf
J9H2Yv0sV/iGkzmFKrXAWpMvMzl0yzAeLmEdBaWndcMUt/wMxmO15SeSv6yE+TWKIF3Lf1GJAZ88
U94KxWDXuQDJt3bqPPktyIIwoRhEX2XDWXGnZbSWE4w8Rw60wF95ywORbUhs5RbFiwjIHO65AfiA
pMY8fdI5WQXZPXkgKloctVhnkNr3SMzuVGGKJLEV0JcolrdaUGFVFXonxLAlcv/0sCpZUjJshb0m
UrcPymlXVsh1MMTlmmPvja1h0yvCsI9Bh5CrRwN2UqvZHwbJ9uIxVYaJka9wYbXWRzMh1ocZJmW/
ssF7exFKXEkXm/y8T1MzQMA/1cF5rBYsTYrOqoO1JquhwA9puLoQ2TXebhEz1bADGgkYrgyAZofc
kz0bwfYCcru0CftwYN2eqTIKVLFX+xq6mmS0RDYO0EWoZpEGLgNwuJxBlRrzDHUVCDMPMvFFk4cl
PRB7jKmxUJho8NaaC4JZq8s0YA5RVV43zqZY6BtcZLNla4O8RGngQEQbimDmp0C8KOQ+1OgLcKPN
UoDxeMojwmEmTsKEFMz52atZ3lYfLZiC5WMkyPPWgKvziHdYMKN67XKxqo9Ujc6Q93qqzokr9hTy
ZMjoUBGnet6xadQaB+FiDM8kHqN7m09V8V7TAWItbUIMPK8JeLW+xNUps+M9qpJc5Fw6PQ7DNzjY
dVjp1ILSJwJSH9X+dIpL58GOljJYiZbypHjkqwuZqRQWh/b9wiqO4n1OZF1WLWrBlC69fTVqYUvI
Rfr46SMVRETw1XHyu5kh8yIOgx2nqInMBZxMJ+VuWo6KNxodF0JGpmzJGJB12xYVQhzL3O2XERut
KlyVJ1OSoSYpw5nDnAdO0VEjzJCIm2BMc6iMOJima20Fkf+LuSKcKEgcw07rAA==