diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-10-02 09:28:42 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-10-02 09:28:42 -0400 |
| commit | ed8cb662f72e4e3e03ee0489593b7d114e5618cf (patch) | |
| tree | 733c31db512febf2d5f5c6820dd7d7a29b1a9c7b /tests | |
| parent | adbc9e73376cc7ef70455197f57aa41104eba7d6 (diff) | |
| parent | c8abc4a6dc53624809a1fcd065ac132678f376ef (diff) | |
| download | vyos-cloud-init-ed8cb662f72e4e3e03ee0489593b7d114e5618cf.tar.gz vyos-cloud-init-ed8cb662f72e4e3e03ee0489593b7d114e5618cf.zip | |
examples/cloud-config-user-groups.txt doc fix, fix pep8
fix documentation of mkpasswd usage in
doc/examples/cloud-config-user-groups.txt
Also, Precise's version of pep8 insists on ordering of imports, but saucy's
has not. So we had some incorrect ordering. This fixes './tools/run-pep8'
on precise.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unittests/test_datasource/test_azure.py | 2 | ||||
| -rw-r--r-- | tests/unittests/test_datasource/test_opennebula.py | 2 | ||||
| -rw-r--r-- | tests/unittests/test_handler/test_handler_seed_random.py | 2 | ||||
| -rw-r--r-- | tests/unittests/test_userdata.py | 2 | ||||
| -rw-r--r-- | tests/unittests/test_util.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py index 86e2ed8c..df7e52d0 100644 --- 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 index 45256a86..e1812a88 100644 --- 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 index 1b0675bb..2b21ac02 100644 --- a/tests/unittests/test_handler/test_handler_seed_random.py +++ b/tests/unittests/test_handler/test_handler_seed_random.py @@ -19,8 +19,8 @@ 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 index b227616c..5ffe8f0a 100644 --- 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 index 87415cb5..38ab0c96 100644 --- 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 |