Skip to content

Commit

Permalink
Always import mock stuff from mode.utils.mocks
Browse files Browse the repository at this point in the history
  • Loading branch information
ask committed May 8, 2018
1 parent c70f170 commit e64cb2c
Show file tree
Hide file tree
Showing 19 changed files with 29 additions and 30 deletions.
2 changes: 1 addition & 1 deletion t/conftest.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import asyncio
from unittest import mock
import pytest
from mode.utils.mocks import Mock

sentinel = object()

Expand Down
2 changes: 1 addition & 1 deletion t/docs/testing/test_figB_agent_to_agent.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from unittest.mock import Mock, patch
import faust
import pytest
from mode.utils.mocks import Mock, patch

app = faust.App('example-test-agent-call')

Expand Down
2 changes: 1 addition & 1 deletion t/functional/serializers/test_registry.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import typing
from unittest.mock import Mock

import faust
import pytest
from faust.exceptions import KeyDecodeError, ValueDecodeError
from faust.utils import json
from mode.utils.mocks import Mock


class Case(typing.NamedTuple):
Expand Down
9 changes: 5 additions & 4 deletions t/functional/test_streams.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import asyncio
from copy import copy
from unittest.mock import Mock
from mode.utils.aiter import aiter, anext
from mode.utils.mocks import AsyncMock

import pytest
from faust.exceptions import ImproperlyConfigured
from faust.streams import maybe_forward
import pytest
from mode.utils.aiter import aiter, anext
from mode.utils.mocks import AsyncMock, Mock

from .helpers import channel_empty, message, put


Expand Down
4 changes: 2 additions & 2 deletions t/functional/web/conftest.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from unittest.mock import Mock
import pytest
from faust.exceptions import SameNode
from faust.web.site import Website
import pytest
from mode.utils.mocks import Mock

BASE_PORT = 6066

Expand Down
3 changes: 1 addition & 2 deletions t/unit/agents/test_actor.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
from unittest.mock import Mock
import pytest
from faust.agents.actor import Actor, AsyncIterableActor, AwaitableActor
from faust.types import TP
from mode.utils.mocks import AsyncMock
from mode.utils.mocks import AsyncMock, Mock


class test_Actor:
Expand Down
3 changes: 1 addition & 2 deletions t/unit/agents/test_manager.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from unittest.mock import Mock
import pytest
from faust.types import TP
from mode.utils.mocks import AsyncMock
from mode.utils.mocks import AsyncMock, Mock


class test_AgentManager:
Expand Down
2 changes: 1 addition & 1 deletion t/unit/sensors/test_base.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from unittest.mock import Mock
import pytest
from faust.sensors import Sensor
from faust.types import TP
from mode.utils.mocks import Mock

TP1 = TP('foo', 0)

Expand Down
4 changes: 2 additions & 2 deletions t/unit/stores/test_base.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from unittest.mock import Mock
import pytest
from mode import label
from faust.stores.base import SerializedStore, Store
from faust.types import TP
from mode import label
from mode.utils.mocks import Mock


class MyStore(Store):
Expand Down
2 changes: 1 addition & 1 deletion t/unit/stores/test_memory.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from unittest.mock import Mock
import pytest
from faust.stores.memory import Store
from faust.types import TP
from mode.utils.mocks import Mock


class test_Store:
Expand Down
2 changes: 1 addition & 1 deletion t/unit/tables/test_table.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from unittest.mock import Mock, patch
import faust
import pytest
from faust.tables.wrappers import WindowWrapper
from mode.utils.mocks import Mock, patch


class TableKey(faust.Record):
Expand Down
3 changes: 2 additions & 1 deletion t/unit/tables/test_wrappers.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import operator
from datetime import datetime
from unittest.mock import Mock

import faust
import pytest
from faust.events import Event
from faust.exceptions import ImproperlyConfigured
from faust.tables.wrappers import WindowSet
from mode.utils.mocks import Mock

DATETIME = datetime.utcnow()
DATETIME_TS = DATETIME.timestamp()
Expand Down
3 changes: 1 addition & 2 deletions t/unit/test_events.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from unittest.mock import Mock
import pytest
from mode.utils.mocks import AsyncMock
from mode.utils.mocks import AsyncMock, Mock
from faust import Event


Expand Down
2 changes: 1 addition & 1 deletion t/unit/test_joins.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from unittest.mock import Mock
import pytest
from faust import Record
from faust.joins import InnerJoin, Join, LeftJoin, OuterJoin, RightJoin
from mode.utils.mocks import Mock


class User(Record):
Expand Down
6 changes: 3 additions & 3 deletions t/unit/test_worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
import socket
import warnings
from pathlib import Path
from unittest.mock import Mock, patch

import pytest
from mode.utils.imports import symbol_by_name
from mode.utils.mocks import AsyncMock
from faust.worker import WEBSITE_CLS, Worker
from faust.utils import terminal
from mode.utils.imports import symbol_by_name
from mode.utils.mocks import AsyncMock, Mock, patch


class CoroEq:
Expand Down
2 changes: 1 addition & 1 deletion t/unit/utils/terminal/test_spinners.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import sys
from unittest.mock import Mock, call, patch
from faust.utils.terminal.spinners import Spinner, SpinnerHandler
from mode.utils.mocks import Mock, call, patch


def spinner(file=None, isatty=True):
Expand Down
3 changes: 2 additions & 1 deletion t/unit/utils/terminal/test_tables.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from contextlib import ExitStack, contextmanager
from unittest.mock import Mock, patch

import pytest
import terminaltables
from faust.utils.terminal import tables
from mode.utils.mocks import Mock, patch

TABLE_DATA = [
('foo', 1.0, 3.33, 6.66, 9.99),
Expand Down
2 changes: 1 addition & 1 deletion t/unit/utils/test_venusian.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from unittest.mock import Mock, patch
from faust.utils import venusian
from mode.utils import Mock, patch


def test_attach():
Expand Down
3 changes: 1 addition & 2 deletions t/unit/web/test_views.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from unittest.mock import Mock, call
import pytest
from mode.utils.mocks import AsyncMock
from mode.utils.mocks import AsyncMock, Mock, call
from faust.web.views import Site, View


Expand Down

0 comments on commit e64cb2c

Please sign in to comment.