[Buildroot] [PATCH 4/5] support/testing: fix remaining code style
Ricardo Martincoski
ricardo.martincoski at gmail.com
Fri Sep 29 02:27:12 UTC 2017
Fix the remaining code style warnings from flake8:
- break lines at 79 columns;
- replace some long lines by equivalent code;
- make flake8 ignore some long lines that need to be that way;
- properly indent continuation lines;
- use simpler code to test a parameter is not None.
Signed-off-by: Ricardo Martincoski <ricardo.martincoski at gmail.com>
---
Warnings from flake8 change from 17 to 0.
---
support/testing/infra/basetest.py | 7 ++++---
support/testing/tests/core/test_post_scripts.py | 15 ++++++++++-----
support/testing/tests/core/test_rootfs_overlay.py | 3 ++-
support/testing/tests/fs/test_iso9660.py | 4 ++--
support/testing/tests/fs/test_squashfs.py | 9 ++++++---
support/testing/tests/init/base.py | 6 +++---
support/testing/tests/init/test_none.py | 4 +++-
7 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py
index 9d5f714b02..045f5e80a4 100644
--- a/support/testing/infra/basetest.py
+++ b/support/testing/infra/basetest.py
@@ -41,13 +41,14 @@ class BRTest(unittest.TestCase):
def __init__(self, names):
super(BRTest, self).__init__(names)
self.testname = self.__class__.__name__
- self.builddir = self.outputdir and os.path.join(self.outputdir, self.testname)
+ self.builddir = self.outputdir and os.path.join(self.outputdir,
+ self.testname)
self.emulator = None
self.config += "BR2_JLEVEL={}\n".format(self.jlevel)
def show_msg(self, msg):
- print "{} {:40s} {}".format(datetime.datetime.now().strftime("%H:%M:%S"),
- self.testname, msg)
+ timestamp = datetime.datetime.now().strftime("%H:%M:%S")
+ print "{} {:40s} {}".format(timestamp, self.testname, msg)
def setUp(self):
self.show_msg("Starting")
diff --git a/support/testing/tests/core/test_post_scripts.py b/support/testing/tests/core/test_post_scripts.py
index 1db568b0d6..c3b81cb4c7 100644
--- a/support/testing/tests/core/test_post_scripts.py
+++ b/support/testing/tests/core/test_post_scripts.py
@@ -26,13 +26,18 @@ class TestPostScripts(infra.basetest.BRTest):
self.assertEqual(lines["arg1"], os.path.join(self.builddir, what))
self.assertEqual(lines["arg2"], "foobar")
self.assertEqual(lines["arg3"], "baz")
- self.assertEqual(lines["TARGET_DIR"], os.path.join(self.builddir, "target"))
- self.assertEqual(lines["BUILD_DIR"], os.path.join(self.builddir, "build"))
- self.assertEqual(lines["HOST_DIR"], os.path.join(self.builddir, "host"))
+ self.assertEqual(lines["TARGET_DIR"],
+ os.path.join(self.builddir, "target"))
+ self.assertEqual(lines["BUILD_DIR"],
+ os.path.join(self.builddir, "build"))
+ self.assertEqual(lines["HOST_DIR"],
+ os.path.join(self.builddir, "host"))
staging = os.readlink(os.path.join(self.builddir, "staging"))
self.assertEqual(lines["STAGING_DIR"], staging)
- self.assertEqual(lines["BINARIES_DIR"], os.path.join(self.builddir, "images"))
- self.assertEqual(lines["BR2_CONFIG"], os.path.join(self.builddir, ".config"))
+ self.assertEqual(lines["BINARIES_DIR"],
+ os.path.join(self.builddir, "images"))
+ self.assertEqual(lines["BR2_CONFIG"],
+ os.path.join(self.builddir, ".config"))
def test_run(self):
f = os.path.join(self.builddir, "build", "post-build.log")
diff --git a/support/testing/tests/core/test_rootfs_overlay.py b/support/testing/tests/core/test_rootfs_overlay.py
index fedd40d8ac..31d6c0fb5e 100644
--- a/support/testing/tests/core/test_rootfs_overlay.py
+++ b/support/testing/tests/core/test_rootfs_overlay.py
@@ -24,7 +24,8 @@ class TestRootfsOverlay(infra.basetest.BRTest):
ret = compare_file(overlay_file, target_file)
self.assertEqual(ret, 0)
- target_file = os.path.join(self.builddir, "target", "etc", "test-file2")
+ target_file = os.path.join(self.builddir, "target", "etc",
+ "test-file2")
overlay_file = "{}2/etc/test-file2".format(self.rootfs_overlay_path)
ret = compare_file(overlay_file, target_file)
self.assertEqual(ret, 0)
diff --git a/support/testing/tests/fs/test_iso9660.py b/support/testing/tests/fs/test_iso9660.py
index 41430eb4d2..216a005a1c 100644
--- a/support/testing/tests/fs/test_iso9660.py
+++ b/support/testing/tests/fs/test_iso9660.py
@@ -57,7 +57,7 @@ class TestIso9660Grub2External(infra.basetest.BRTest):
BR2_TARGET_GRUB2_BOOT_PARTITION="cd"
BR2_TARGET_GRUB2_BUILTIN_MODULES="boot linux ext2 fat part_msdos part_gpt normal biosdisk iso9660"
BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="{}"
- """.format(infra.filepath("conf/grub2.cfg"))
+ """.format(infra.filepath("conf/grub2.cfg")) # noqa
def test_run(self):
exit_code = test_mount_internal_external(self.emulator,
@@ -77,7 +77,7 @@ class TestIso9660Grub2Internal(infra.basetest.BRTest):
BR2_TARGET_GRUB2_BOOT_PARTITION="cd"
BR2_TARGET_GRUB2_BUILTIN_MODULES="boot linux ext2 fat part_msdos part_gpt normal biosdisk iso9660"
BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="{}"
- """.format(infra.filepath("conf/grub2.cfg"))
+ """.format(infra.filepath("conf/grub2.cfg")) # noqa
def test_run(self):
exit_code = test_mount_internal_external(self.emulator,
diff --git a/support/testing/tests/fs/test_squashfs.py b/support/testing/tests/fs/test_squashfs.py
index 066c054342..58640d557f 100644
--- a/support/testing/tests/fs/test_squashfs.py
+++ b/support/testing/tests/fs/test_squashfs.py
@@ -14,13 +14,15 @@ class TestSquashfs(infra.basetest.BRTest):
"""
def test_run(self):
- unsquashfs_cmd = ["host/bin/unsquashfs", "-s", "images/rootfs.squashfs"]
+ unsquashfs_cmd = ["host/bin/unsquashfs", "-s",
+ "images/rootfs.squashfs"]
out = subprocess.check_output(unsquashfs_cmd,
cwd=self.builddir,
env={"LANG": "C"})
out = out.splitlines()
self.assertEqual(out[0],
- "Found a valid SQUASHFS 4:0 superblock on images/rootfs.squashfs.")
+ "Found a valid SQUASHFS 4:0 superblock on "
+ "images/rootfs.squashfs.")
self.assertEqual(out[3], "Compression lz4")
img = os.path.join(self.builddir, "images", "rootfs.squashfs")
@@ -30,7 +32,8 @@ class TestSquashfs(infra.basetest.BRTest):
kernel="builtin",
kernel_cmdline=["root=/dev/mmcblk0",
"rootfstype=squashfs"],
- options=["-drive", "file={},if=sd,format=raw".format(img)])
+ options=["-drive",
+ "file={},if=sd,format=raw".format(img)])
self.emulator.login()
cmd = "mount | grep '/dev/root on / type squashfs'"
diff --git a/support/testing/tests/init/base.py b/support/testing/tests/init/base.py
index c09ee46eb0..3764d6ab95 100644
--- a/support/testing/tests/init/base.py
+++ b/support/testing/tests/init/base.py
@@ -6,7 +6,7 @@ import infra.basetest
class InitSystemBase(infra.basetest.BRTest):
def startEmulator(self, fs_type, kernel=None, dtb=None, init=None):
- img = os.path.join(self.builddir, "images", "rootfs.{}".format(fs_type))
+ img = os.path.join(self.builddir, "images", "rootfs." + fs_type)
subprocess.call(["truncate", "-s", "%1M", img])
options = ["-drive",
@@ -18,7 +18,7 @@ class InitSystemBase(infra.basetest.BRTest):
else:
kernel = os.path.join(self.builddir, "images", kernel)
options.extend(["-dtb", os.path.join(self.builddir, "images",
- "{}.dtb".format(dtb))])
+ "{}.dtb".format(dtb))])
kernel_cmdline = ["root=/dev/mmcblk0",
"rootfstype={}".format(fs_type),
@@ -26,7 +26,7 @@ class InitSystemBase(infra.basetest.BRTest):
"ro",
"console=ttyAMA0"]
- if not init is None:
+ if init:
kernel_cmdline.extend(["init={}".format(init)])
self.emulator.boot(arch="armv7",
diff --git a/support/testing/tests/init/test_none.py b/support/testing/tests/init/test_none.py
index c8a79f0bab..22e4850853 100644
--- a/support/testing/tests/init/test_none.py
+++ b/support/testing/tests/init/test_none.py
@@ -14,7 +14,9 @@ class TestInitSystemNone(InitSystemBase):
def test_run(self):
self.startEmulator(fs_type="squashfs", init="/bin/sh")
- index = self.emulator.qemu.expect(["/bin/sh: can't access tty; job control turned off", pexpect.TIMEOUT], timeout=60)
+ index = self.emulator.qemu.expect(["/bin/sh: can't access tty; "
+ "job control turned off",
+ pexpect.TIMEOUT], timeout=60)
if index != 0:
self.emulator.logfile.write("==> System does not boot")
raise SystemError("System does not boot")
--
2.13.0
More information about the buildroot
mailing list