summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@gmail.com>2016-06-15 12:17:05 -0700
committerJoshua Harlow <harlowja@gmail.com>2016-06-15 12:17:05 -0700
commit417fda64958f04c705860b737787fc921b965ade (patch)
tree5d2b5dcef14549ed4228e7a4b914223b612497a9
parent2c5c2d7a500ccb88eee245a1d5f1ca1f9a2156e6 (diff)
downloadvyos-cloud-init-417fda64958f04c705860b737787fc921b965ade.tar.gz
vyos-cloud-init-417fda64958f04c705860b737787fc921b965ade.zip
Fix a few tools and tests for newer pep8
-rw-r--r--tests/unittests/test_cli.py3
-rwxr-xr-xtools/run-pep85
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/unittests/test_cli.py b/tests/unittests/test_cli.py
index 8268cd5e..a53e7116 100644
--- a/tests/unittests/test_cli.py
+++ b/tests/unittests/test_cli.py
@@ -4,10 +4,11 @@ import six
import sys
from . import helpers as test_helpers
-mock = test_helpers.mock
from cloudinit.cmd import main as cli
+mock = test_helpers.mock
+
class TestCLI(test_helpers.FilesystemMockingTestCase):
diff --git a/tools/run-pep8 b/tools/run-pep8
index 086400fc..4bd0bbfb 100755
--- a/tools/run-pep8
+++ b/tools/run-pep8
@@ -1,8 +1,7 @@
#!/bin/bash
-pycheck_dirs=( "cloudinit/" "bin/" "tests/" "tools/" )
-# FIXME: cloud-init modifies sys module path, pep8 does not like
-# bin_files=( "bin/cloud-init" )
+pycheck_dirs=( "cloudinit/" "tests/" "tools/" )
+
CR="
"
[ "$1" = "-v" ] && { verbose="$1"; shift; } || verbose=""