The attempt to merge lp:~davidpbritton/landscape-charm/vhost-config-relation into lp:landscape-charm/trunk failed. Below is the output from the failed tests.

trial hooks
hooks.test_hooks
  TestHooksService
    test__download_file_failure ...                                        [OK]
    test__download_file_success ...                                        [OK]
    test__enable_service ...                                               [OK]
    test__enable_wrong_service ...                                         [OK]
    test__install_license_text ...                                         [OK]
    test__install_license_url ...                                          [OK]
    test__replace_in_file ...                                              [OK]
    test_amqp_relation_changed_no_hostname_password ...                    [OK]
    test_amqp_relation_joined ...                                          [OK]
    test_calc_daemon_count ...                                             [OK]
    test_config_changed ...                                                [OK]
    test_config_changed_service_count_bare ...                             [OK]
    test_config_changed_service_count_labeled ...                          [OK]
    test_config_changed_service_count_update_haproxy ...                   [OK]
    test_config_changed_starts_landscape ...                               [OK]
    test_config_changed_without_amqp_skips_start ...                       [OK]
    test_config_changed_without_db_skips_start ...                         [OK]
    test_config_changed_zero ...                                           [OK]
    test_data_relation_changed_creates_new_log_and_repository_paths ...    [OK]
    test_data_relation_changed_error_on_mountpoint_from_subordinate ...    [OK]
    test_data_relation_changed_sets_mountpoint_awaits_init ...             [OK]
    test_data_relation_changed_success_no_repository_data ...              [OK]
    test_data_relation_changed_success_no_repository_path ...              [OK]
    test_data_relation_changed_success_with_repository_data ...            [OK]
    test_db_admin_relation_changed ...                                  [ERROR]
    test_db_admin_relation_changed_failover_state_ignore ...               [OK]
    test_db_admin_relation_changed_hot_standby_state_ignore ...            [OK]
    test_db_admin_relation_changed_no_config_if_db_down ...                [OK]
    test_db_admin_relation_changed_no_user ...                             [OK]
    test_db_admin_relation_changed_not_in_allowed_units ...                [OK]
    test_db_admin_relation_changed_standalone_state_ignore ...             [OK]
    test_get_requested_service_count ...                                   [OK]
    test_get_requested_services ...                                        [OK]
    test_get_services_dict ...                                             [OK]
    test_get_services_non_proxied ...                                      [OK]
    test_handle_empty_license ...                                          [OK]
    test_handle_no_license ...                                             [OK]
    test_is_db_up_db_not_configured ...                                    [OK]
    test_is_db_up_no_service_config ...                                    [OK]
    test_is_db_up_service_config_missing_keys ...                          [OK]
    test_is_db_up_service_config_missing_stores ...                        [OK]
    test_is_db_up_with_db_configured ...                                   [OK]
    test_maintenance ...                                                   [OK]
    test_maintenance_file_not_removed_if_amqp_is_not_up ...                [OK]
    test_maintenance_file_not_removed_if_db_is_not_up ...                  [OK]
    test_maintenance_file_only_removed_if_db_and_amqp_are ...              [OK]
    test_upgrade_schema ...                                                [OK]
    test_wb_chown_sets_dir_and_file_ownership_to_landscape ...             [OK]
    test_wb_create_maintenance_user_creates_on_lds_less_than_14_01 ...     [OK]
    test_wb_create_maintenance_user_not_created_if_lds_not_installed ...   [OK]
    test_wb_create_maintenance_user_not_created_on_14_01 ...               [OK]
    test_wb_get_installed_version_error_when_not_installed ...             [OK]
    test_wb_get_installed_version_success_when_installed ...               [OK]
  TestHooksServiceMock
    test_format_service ...                                                [OK]
    test_format_service_with_errorfile_not_found ...                       [OK]
    test_format_service_with_errorfiles ...                                [OK]
    test_format_service_with_more_options ...                              [OK]
    test_format_service_with_option ...                                    [OK]
    test_get_services ...                                                  [OK]
    test_notify_vhost_config_relation ...                                  [OK]
    test_notify_vhost_config_relation_specify_id ...                       [OK]
    test_notify_website_relation ...                                       [OK]
    test_vhost_config_relation_changed_cert_not_provided ...               [OK]
    test_vhost_config_relation_changed_exit_no_configuration ...           [OK]
    test_vhost_config_relation_changed_fail_root_url ...                   [OK]
    test_vhost_config_relation_changed_fail_root_url_db_update ...         [OK]
    test_vhost_config_relation_changed_ssl_cert_provided ...               [OK]
    test_vhost_config_relation_changed_wait_apache_servername ...          [OK]
    test_website_relation_joined ...                                       [OK]
  TestHooksUtils
    test__setup_apache ...                                                 [OK]

===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 327, in run
    testMethod()
  File "/usr/lib/python2.7/dist-packages/mocker.py", line 146, in test_method_wrapper
    result = test_method()
  File "/var/tmp/tarmac/landscape-charm/trunk/hooks/test_hooks.py", line 886, in test_db_admin_relation_changed
    hooks.db_admin_relation_changed()
  File "/var/tmp/tarmac/landscape-charm/trunk/hooks/hooks.py", line 179, in db_admin_relation_changed
    with closing(util.connect(host, admin, admin_password)):
  File "/usr/lib/python2.7/dist-packages/psycopg2/__init__.py", line 179, in connect
    connection_factory=connection_factory, async=async)
psycopg2.OperationalError: missing "=" after "postgres/0" in connection info string


hooks.test_hooks.TestHooksService.test_db_admin_relation_changed
-------------------------------------------------------------------------------
Ran 70 tests in 0.790s

FAILED (errors=1, successes=69)

make: *** [test] Error 1