Merge pull request #82 from trobert2/test_refactor6

Fixed various pep8 errors

cloudbaseinit/tests/metadata/services/test_httpservice.py

@@ -21,8 +21,8 @@ import unittest
 from oslo.config import cfg
 from six.moves.urllib import error
 
-from cloudbaseinit.metadata.services import httpservice
 from cloudbaseinit.metadata.services import base
+from cloudbaseinit.metadata.services import httpservice
 
 CONF = cfg.CONF
 

cloudbaseinit/tests/osutils/test_windows.py

@@ -14,7 +14,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import ctypes
 import importlib
 import mock
 import os
@@ -27,7 +26,7 @@ CONF = cfg.CONF
 
 
 class WindowsUtilsTest(unittest.TestCase):
-    '''Tests for the windows utils class'''
+    '''Tests for the windows utils class.'''
 
     _CONFIG_NAME = 'FakeConfig'
     _DESTINATION = '192.168.192.168'

cloudbaseinit/tests/plugins/windows/test_userdatautils.py

@@ -14,7 +14,6 @@
 
 import mock
 import os
-import uuid
 import unittest
 
 from oslo.config import cfg

cloudbaseinit/tests/utils/test_dhcp.py

@@ -14,14 +14,11 @@
 
 import mock
 import netifaces
-import struct
 import socket
+import struct
 import unittest
 
 from cloudbaseinit.utils import dhcp
-from oslo.config import cfg
-
-CONF = cfg.CONF
 
 
 class DHCPUtilsTests(unittest.TestCase):