From 1aa4d4ea6835221719a12134a8314d6d4b8eeb61 Mon Sep 17 00:00:00 2001 From: Eric Nordlund Date: Tue, 1 Oct 2013 14:19:43 -0700 Subject: Reordered several imports in order for test suite to pass. --- tests/unittests/test_datasource/test_azure.py | 2 +- tests/unittests/test_datasource/test_opennebula.py | 2 +- tests/unittests/test_handler/test_handler_seed_random.py | 3 ++- tests/unittests/test_userdata.py | 2 +- tests/unittests/test_util.py | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) mode change 100644 => 100755 tests/unittests/test_datasource/test_azure.py mode change 100644 => 100755 tests/unittests/test_datasource/test_opennebula.py mode change 100644 => 100755 tests/unittests/test_handler/test_handler_seed_random.py mode change 100644 => 100755 tests/unittests/test_userdata.py mode change 100644 => 100755 tests/unittests/test_util.py (limited to 'tests') diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py old mode 100644 new mode 100755 index 86e2ed8c..df7e52d0 --- a/tests/unittests/test_datasource/test_azure.py +++ b/tests/unittests/test_datasource/test_azure.py @@ -2,8 +2,8 @@ from cloudinit import helpers from cloudinit.sources import DataSourceAzure from tests.unittests.helpers import populate_dir -import crypt import base64 +import crypt from mocker import MockerTestCase import os import yaml diff --git a/tests/unittests/test_datasource/test_opennebula.py b/tests/unittests/test_datasource/test_opennebula.py old mode 100644 new mode 100755 index 45256a86..e1812a88 --- a/tests/unittests/test_datasource/test_opennebula.py +++ b/tests/unittests/test_datasource/test_opennebula.py @@ -1,5 +1,5 @@ -from cloudinit.sources import DataSourceOpenNebula as ds from cloudinit import helpers +from cloudinit.sources import DataSourceOpenNebula as ds from cloudinit import util from mocker import MockerTestCase from tests.unittests.helpers import populate_dir diff --git a/tests/unittests/test_handler/test_handler_seed_random.py b/tests/unittests/test_handler/test_handler_seed_random.py old mode 100644 new mode 100755 index 1b0675bb..1c0d284c --- a/tests/unittests/test_handler/test_handler_seed_random.py +++ b/tests/unittests/test_handler/test_handler_seed_random.py @@ -19,8 +19,9 @@ from cloudinit.config import cc_seed_random import base64 -import tempfile import gzip +import tempfile + from StringIO import StringIO diff --git a/tests/unittests/test_userdata.py b/tests/unittests/test_userdata.py old mode 100644 new mode 100755 index b227616c..5ffe8f0a --- a/tests/unittests/test_userdata.py +++ b/tests/unittests/test_userdata.py @@ -6,9 +6,9 @@ import gzip import logging import os +from email.mime.application import MIMEApplication from email.mime.base import MIMEBase from email.mime.multipart import MIMEMultipart -from email.mime.application import MIMEApplication from cloudinit import handlers from cloudinit import helpers as c_helpers diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py old mode 100644 new mode 100755 index 87415cb5..38ab0c96 --- a/tests/unittests/test_util.py +++ b/tests/unittests/test_util.py @@ -5,8 +5,8 @@ import stat import yaml from mocker import MockerTestCase -from unittest import TestCase from tests.unittests import helpers +from unittest import TestCase from cloudinit import importer from cloudinit import util -- cgit v1.2.3