Code review comment for lp://staging/~pedronis/charms/trusty/apache2/nagios_extra_check_https

Samuele,

I took the time to propose a merge against this branch of code with *some* of the suggestions that I made in the review. Please review my merge proposal.

lp:~mbruzek/charms/trusty/apache2/nagios_extra_check_https

This proposal fixes some of the amulet problems but does not address the failing amulet tests.

The failing tests are listed below:
======================================================================
ERROR: tests.test_vhost_config_relation.CreateVhostTest.test_create_vhost_missing_template
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/home/ubuntu/trusty/apache2/.venv/local/lib/python2.7/site-packages/mock/mock.py", line 1305, in patched
    return func(*args, **keywargs)
  File "/tmp/bundletester-JYI8cM/apache2/hooks/tests/test_vhost_config_relation.py", line 37, in test_create_vhost_missing_template
    mock_close_port.assert_called_once()
  File "/home/ubuntu/trusty/apache2/.venv/local/lib/python2.7/site-packages/mock/mock.py", line 721, in __getattr__
    raise AttributeError(name)
AttributeError: assert_called_once

======================================================================
ERROR: tests.test_vhost_config_relation.CreateVhostTest.test_create_vhost_template_directly
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/home/ubuntu/trusty/apache2/.venv/local/lib/python2.7/site-packages/mock/mock.py", line 1305, in patched
    return func(*args, **keywargs)
  File "/tmp/bundletester-JYI8cM/apache2/hooks/tests/test_vhost_config_relation.py", line 114, in test_create_vhost_template_directly
    mock_open_port.assert_called_once()
  File "/home/ubuntu/trusty/apache2/.venv/local/lib/python2.7/site-packages/mock/mock.py", line 721, in __getattr__
    raise AttributeError(name)
AttributeError: assert_called_once

======================================================================
ERROR: tests.test_vhost_config_relation.CreateVhostTest.test_create_vhost_template_through_config_no_protocol
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/home/ubuntu/trusty/apache2/.venv/local/lib/python2.7/site-packages/mock/mock.py", line 1305, in patched
    return func(*args, **keywargs)
  File "/tmp/bundletester-JYI8cM/apache2/hooks/tests/test_vhost_config_relation.py", line 62, in test_create_vhost_template_through_config_no_protocol
    mock_open_port.assert_called_once()
  File "/home/ubuntu/trusty/apache2/.venv/local/lib/python2.7/site-packages/mock/mock.py", line 721, in __getattr__
    raise AttributeError(name)
AttributeError: assert_called_once

======================================================================
ERROR: tests.test_vhost_config_relation.CreateVhostTest.test_create_vhost_template_through_config_with_protocol
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/home/ubuntu/trusty/apache2/.venv/local/lib/python2.7/site-packages/mock/mock.py", line 1305, in patched
    return func(*args, **keywargs)
  File "/tmp/bundletester-JYI8cM/apache2/hooks/tests/test_vhost_config_relation.py", line 88, in test_create_vhost_template_through_config_with_protocol
    mock_open_port.assert_called_once()
  File "/home/ubuntu/trusty/apache2/.venv/local/lib/python2.7/site-packages/mock/mock.py", line 721, in __getattr__
    raise AttributeError(name)
AttributeError: assert_called_once