diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-29 20:32:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-29 20:32:47 +0000 |
| commit | 1baa802d68bd9ad3b7f3bd67fd8bebaabc8d595a (patch) | |
| tree | 4c43fb4f0e0d967695f5b39e375357df31f04512 | |
| parent | 4b1aa5ccaf92ea652f33842e24a547f07fa3b9df (diff) | |
| parent | b847b170af94a739bcfa8c614d117db3b9e4e25b (diff) | |
| download | tempest-lib-1baa802d68bd9ad3b7f3bd67fd8bebaabc8d595a.tar.gz | |
Merge "Fix order of std and third party lib import"
| -rw-r--r-- | tempest_lib/cli/base.py | 3 | ||||
| -rw-r--r-- | tempest_lib/tests/services/compute/base.py | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tempest_lib/cli/base.py b/tempest_lib/cli/base.py index d5250ff..a80c84b 100644 --- a/tempest_lib/cli/base.py +++ b/tempest_lib/cli/base.py @@ -16,9 +16,10 @@ import logging import os import shlex -import six import subprocess +import six + from tempest_lib import base import tempest_lib.cli.output_parser from tempest_lib import exceptions diff --git a/tempest_lib/tests/services/compute/base.py b/tempest_lib/tests/services/compute/base.py index 09a3d82..fb3313b 100644 --- a/tempest_lib/tests/services/compute/base.py +++ b/tempest_lib/tests/services/compute/base.py @@ -13,7 +13,6 @@ # under the License. import httplib2 - from oslo_serialization import jsonutils as json from oslotest import mockpatch |