Merge "Fix mock import statements"

This commit is contained in:
Zuul 2020-04-21 12:44:24 +00:00 committed by Gerrit Code Review
commit 1571a1a3e4
7 changed files with 6 additions and 7 deletions

View File

@ -28,7 +28,6 @@ keystoneauth1==3.4.0
linecache2==1.0.0
MarkupSafe==1.0
mccabe==0.2.1
mock==2.0.0
monotonic==0.6
mox3==0.20.0
msgpack-python==0.4.0

View File

@ -14,9 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from unittest import mock
import warnings
import mock
from oslotest import base
from monascaclient import client

View File

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import mock
from unittest import mock
from oslotest import base

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
from oslotest import base

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
from oslotest import base

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
from oslotest import base

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
from oslotest import base