diff options
author | Darragh Bailey <dbailey@hp.com> | 2014-11-10 13:07:55 +0000 |
---|---|---|
committer | Wayne Warren <waynr+launchpad@sdf.org> | 2015-12-23 15:23:42 -0800 |
commit | 8805a34c0ff71cda61498ec1d7df03ab2835943d (patch) | |
tree | 274bfc68cfbc41e9f209a28bf01feb35326e0d6e /tests/base.py | |
parent | 245f643522da0236254bb14f055df5cbb571938f (diff) | |
download | python-jenkins-job-builder-8805a34c0ff71cda61498ec1d7df03ab2835943d.tar.gz python-jenkins-job-builder-8805a34c0ff71cda61498ec1d7df03ab2835943d.tar.xz python-jenkins-job-builder-8805a34c0ff71cda61498ec1d7df03ab2835943d.zip |
Reorder imports to match hacking guidelines
Ensure that the imports follow the standard OpenStack hacking
guidelines.
Change-Id: Iaa4326aef118ddfd807dd006934f1d9ca80a1cfa
Diffstat (limited to 'tests/base.py')
-rw-r--r-- | tests/base.py | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/tests/base.py b/tests/base.py index 662a1170..d97d0feb 100644 --- a/tests/base.py +++ b/tests/base.py @@ -17,20 +17,32 @@ # License for the specific language governing permissions and limitations # under the License. -import io -import os -import re import doctest -import logging -import fixtures +import io import json +import logging import operator -import testtools -from testtools.content import text_content +import os +import re import xml.etree.ElementTree as XML + +import fixtures from six.moves import configparser from six.moves import StringIO +import testtools +from testtools.content import text_content from yaml import safe_dump + +from jenkins_jobs.cmd import DEFAULT_CONF +import jenkins_jobs.local_yaml as yaml +from jenkins_jobs.modules import project_externaljob +from jenkins_jobs.modules import project_flow +from jenkins_jobs.modules import project_matrix +from jenkins_jobs.modules import project_maven +from jenkins_jobs.modules import project_multijob +from jenkins_jobs.parser import YamlParser +from jenkins_jobs.xml_config import XmlJob + # This dance deals with the fact that we want unittest.mock if # we're on Python 3.4 and later, and non-stdlib mock otherwise. try: @@ -38,16 +50,6 @@ try: except ImportError: import mock # noqa -from jenkins_jobs.cmd import DEFAULT_CONF -import jenkins_jobs.local_yaml as yaml -from jenkins_jobs.parser import YamlParser -from jenkins_jobs.xml_config import XmlJob -from jenkins_jobs.modules import (project_flow, - project_matrix, - project_maven, - project_multijob, - project_externaljob) - def get_scenarios(fixtures_path, in_ext='yaml', out_ext='xml', plugins_info_ext='plugins_info.yaml', |