diff options
| author | Dean Troyer <dtroyer@gmail.com> | 2017-09-14 11:06:51 -0500 |
|---|---|---|
| committer | Dean Troyer <dtroyer@gmail.com> | 2017-09-14 11:16:11 -0500 |
| commit | 5309bf5f873aba4e994c9011a893987c40d56eda (patch) | |
| tree | 9e1bf90f6bb27cc6e0a5f9b4ef81ef8431d21599 /openstackclient/tests/unit/network | |
| parent | 5e5239d5eb635470b0c3bc63c4a6263808c41c9b (diff) | |
| parent | f63bb180036c0f2d096eefaaaf2fbdd60a427343 (diff) | |
| download | python-openstackclient-5309bf5f873aba4e994c9011a893987c40d56eda.tar.gz | |
Merge remote-tracking branch 'origin/master' into f4-merge-branch
Change-Id: Ie6c321e67aa9338334e4649879e60847a5d1eb56
Diffstat (limited to 'openstackclient/tests/unit/network')
5 files changed, 8 insertions, 5 deletions
diff --git a/openstackclient/tests/unit/network/test_common.py b/openstackclient/tests/unit/network/test_common.py index 4b9a754b..d4d3a277 100644 --- a/openstackclient/tests/unit/network/test_common.py +++ b/openstackclient/tests/unit/network/test_common.py @@ -12,9 +12,10 @@ # import argparse -import mock +import mock import openstack + from openstackclient.common import exceptions from openstackclient.network import common from openstackclient.tests.unit import utils diff --git a/openstackclient/tests/unit/network/v2/fakes.py b/openstackclient/tests/unit/network/v2/fakes.py index eadab584..bdc1c1fb 100644 --- a/openstackclient/tests/unit/network/v2/fakes.py +++ b/openstackclient/tests/unit/network/v2/fakes.py @@ -13,11 +13,12 @@ import argparse import copy -import mock from random import choice from random import randint import uuid +import mock + from openstackclient.tests.unit import fakes from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes_v3 from openstackclient.tests.unit import utils diff --git a/openstackclient/tests/unit/network/v2/test_network.py b/openstackclient/tests/unit/network/v2/test_network.py index 84d0d95c..a9472a77 100644 --- a/openstackclient/tests/unit/network/v2/test_network.py +++ b/openstackclient/tests/unit/network/v2/test_network.py @@ -11,10 +11,10 @@ # under the License. # -import mock -from mock import call import random +import mock +from mock import call from osc_lib.cli import format_columns from osc_lib import exceptions diff --git a/openstackclient/tests/unit/network/v2/test_port.py b/openstackclient/tests/unit/network/v2/test_port.py index 021ddd5e..1f901fef 100644 --- a/openstackclient/tests/unit/network/v2/test_port.py +++ b/openstackclient/tests/unit/network/v2/test_port.py @@ -12,8 +12,8 @@ # import argparse -import mock +import mock from mock import call from osc_lib.cli import format_columns from osc_lib import exceptions diff --git a/openstackclient/tests/unit/network/v2/test_subnet_pool.py b/openstackclient/tests/unit/network/v2/test_subnet_pool.py index 71ab2c76..4973076a 100644 --- a/openstackclient/tests/unit/network/v2/test_subnet_pool.py +++ b/openstackclient/tests/unit/network/v2/test_subnet_pool.py @@ -12,6 +12,7 @@ # import argparse + import mock from mock import call |