Merge pull request #426 from OlegGirko/fix_mock_import

Fix mock import in tests.
This commit is contained in:
Mark Haines 2015-12-07 13:13:09 +00:00
commit dd108286df

View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import uuid import uuid
from mock.mock import Mock from mock import Mock
from synapse.types import RoomID, UserID from synapse.types import RoomID, UserID
from tests import unittest from tests import unittest