p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3612 from mimi1vx/patch-1 

Prefer unittest.mock before mock
This commit is contained in:
Ronny Pfannschmidt 2018-06-24 16:33:49 +02:00 committed by GitHub
parent 50a0d4fa95 deff54aae0
commit 42b3125783
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -157,6 +157,7 @@ Oleg Sushchenko
Oliver Bestwalter
Omar Kohl
Omer Hadari
Ondřej Súkup
Patrick Hayes
Paweł Adamczak
Pedro Algarvio

6
testing/test_mark.py
View File

@ -1,7 +1,11 @@
from __future__ import absolute_import, division, print_function
import os
import sys
import mock
try:
import mock
except ImportError:
import unittest.mock as mock
import pytest
from _pytest.mark import (
MarkGenerator as Mark,