Merge pull request #5497 from armills/test-port-fixes

Fix network tests to use get_test_instance_port
This commit is contained in:
Robbie Trencheny 2017-01-24 21:10:00 -08:00 committed by GitHub
commit 794852f76f
3 changed files with 21 additions and 3 deletions

View file

@ -7,10 +7,12 @@ import pytest
from homeassistant.bootstrap import setup_component
from homeassistant.const import ATTR_ENTITY_PICTURE
import homeassistant.components.camera as camera
import homeassistant.components.http as http
from homeassistant.exceptions import HomeAssistantError
from homeassistant.util.async import run_coroutine_threadsafe
from tests.common import get_test_home_assistant, assert_setup_component
from tests.common import (
get_test_home_assistant, get_test_instance_port, assert_setup_component)
class TestSetupCamera(object):
@ -43,6 +45,10 @@ class TestGetImage(object):
"""Setup things to be run when tests are started."""
self.hass = get_test_home_assistant()
setup_component(
self.hass, http.DOMAIN,
{http.DOMAIN: {http.CONF_SERVER_PORT: get_test_instance_port()}})
config = {
camera.DOMAIN: {
'platform': 'demo'

View file

@ -5,9 +5,11 @@ from homeassistant.core import callback
from homeassistant.const import ATTR_ENTITY_PICTURE
from homeassistant.bootstrap import setup_component
from homeassistant.exceptions import HomeAssistantError
import homeassistant.components.http as http
import homeassistant.components.image_processing as ip
from tests.common import get_test_home_assistant, assert_setup_component
from tests.common import (
get_test_home_assistant, get_test_instance_port, assert_setup_component)
class TestSetupImageProcessing(object):
@ -53,6 +55,10 @@ class TestImageProcessing(object):
"""Setup things to be run when tests are started."""
self.hass = get_test_home_assistant()
setup_component(
self.hass, http.DOMAIN,
{http.DOMAIN: {http.CONF_SERVER_PORT: get_test_instance_port()}})
config = {
ip.DOMAIN: {
'platform': 'demo'

View file

@ -6,6 +6,7 @@ from unittest.mock import patch, PropertyMock
import requests
import homeassistant.components.http as http
import homeassistant.components.tts as tts
from homeassistant.components.tts.demo import DemoProvider
from homeassistant.components.media_player import (
@ -14,7 +15,8 @@ from homeassistant.components.media_player import (
from homeassistant.bootstrap import setup_component
from tests.common import (
get_test_home_assistant, assert_setup_component, mock_service)
get_test_home_assistant, get_test_instance_port, assert_setup_component,
mock_service)
class TestTTS(object):
@ -26,6 +28,10 @@ class TestTTS(object):
self.demo_provider = DemoProvider('en')
self.default_tts_cache = self.hass.config.path(tts.DEFAULT_CACHE_DIR)
setup_component(
self.hass, http.DOMAIN,
{http.DOMAIN: {http.CONF_SERVER_PORT: get_test_instance_port()}})
def teardown_method(self):
"""Stop everything that was started."""
if os.path.isdir(self.default_tts_cache):