Skip to content

Commit

Permalink
moved async_tests to aio_tests
Browse files Browse the repository at this point in the history
modified *.pyproj to reference in the new folder
modified test configuration to exclude the (new) aio_tests folder
  • Loading branch information
coreGreenberet committed Jun 11, 2018
1 parent 48c3fad commit 04eae42
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
command: |
. venv/bin/activate
export PYTHONPATH=`pwd`;
pytest -n auto --cov=./ --junitxml=test-reports/junit.xml tests --ignore=tests/async_tests/
pytest -n auto --cov=./ --junitxml=test-reports/junit.xml tests --ignore=tests/aio_tests/
bash <(curl -s https://codecov.io/bash)
- store_test_results:
Expand Down
16 changes: 8 additions & 8 deletions homematicip.pyproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="hmip_generate_auth_token.py" />
<Compile Include="homematicip\async\class_maps.py" />
<Compile Include="homematicip\async\connection.py" />
<Compile Include="homematicip\async\device.py" />
<Compile Include="homematicip\async\group.py" />
<Compile Include="homematicip\async\home.py" />
<Compile Include="homematicip\async\securityEvent.py" />
<Compile Include="homematicip\async\__init__.py" />
<Compile Include="homematicip\aio\class_maps.py" />
<Compile Include="homematicip\aio\connection.py" />
<Compile Include="homematicip\aio\device.py" />
<Compile Include="homematicip\aio\group.py" />
<Compile Include="homematicip\aio\home.py" />
<Compile Include="homematicip\aio\securityEvent.py" />
<Compile Include="homematicip\aio\__init__.py" />
<Compile Include="homematicip\auth.py">
<SubType>Code</SubType>
</Compile>
Expand Down Expand Up @@ -111,7 +111,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="homematicip\" />
<Folder Include="homematicip\async\" />
<Folder Include="homematicip\aio\" />
<Folder Include="homematicip\base\" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if __name__ == '__main__':
import pytest
pytest.main('tests --ignore=tests/async_tests/')
pytest.main('tests --ignore=tests/aio_tests/')
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from aiohttp.resolver import DefaultResolver
from aiohttp.test_utils import unused_port

from homematicip.async.connection import AsyncConnection
from homematicip.aio.connection import AsyncConnection
from homematicip.base.base_connection import ATTR_AUTH_TOKEN, ATTR_CLIENT_AUTH


Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pytest

from homematicip.async.group import AsyncHeatingGroup
from homematicip.aio.group import AsyncHeatingGroup


@pytest.mark.asyncio
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pytest
import asyncio
from homematicip.async.home import AsyncHome
from homematicip.aio.home import AsyncHome
from homematicip.base.base_connection import HmipConnectionError


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import aiohttp
import pytest

from homematicip.async.connection import AsyncConnection
from homematicip.aio.connection import AsyncConnection
from homematicip.base.base_connection import HmipWrongHttpStatusError, \
HmipConnectionError, \
ATTR_AUTH_TOKEN, ATTR_CLIENT_AUTH, HmipServerCloseError
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import pytest

from homematicip.async.device import AsyncPlugableSwitchMeasuring
from homematicip.aio.device import AsyncPlugableSwitchMeasuring
from tests.json_data.plugable_switch_measuring import \
plugable_switch_measuring, fake_device_id, fake_home_id

Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import contextlib

from unittest.mock import MagicMock
from homematicip.async.connection import AsyncConnection
from homematicip.aio.connection import AsyncConnection
from homematicip.home import Home
from homematicip.connection import Connection

Expand Down

0 comments on commit 04eae42

Please sign in to comment.