f4ff135e78
check_network() must check the error code of the command
used to check the network configuration with the value
passed as argument "exitCode".
But this argument is ignored since this commit [1].
Revert the last change of check_network().
Fixes:
https://gitlab.com/kubu93/buildroot/-/jobs/1522848308
https://gitlab.com/kubu93/buildroot/-/jobs/1522848306
[1] afc1ed4d51
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
47 lines
1.5 KiB
Python
47 lines
1.5 KiB
Python
import os
|
|
import infra.basetest
|
|
|
|
|
|
class InitSystemBase(infra.basetest.BRTest):
|
|
|
|
def start_emulator(self, fs_type, kernel=None, dtb=None, init=None):
|
|
img = os.path.join(self.builddir, "images", "rootfs.{}".format(fs_type))
|
|
infra.img_round_power2(img)
|
|
|
|
options = ["-drive",
|
|
"file={},if=sd,format=raw".format(img),
|
|
"-M", "vexpress-a9"]
|
|
|
|
if kernel is None:
|
|
kernel = "builtin"
|
|
else:
|
|
kernel = os.path.join(self.builddir, "images", kernel)
|
|
options.extend(["-dtb", os.path.join(self.builddir, "images",
|
|
"{}.dtb".format(dtb))])
|
|
|
|
kernel_cmdline = ["root=/dev/mmcblk0",
|
|
"rootfstype={}".format(fs_type),
|
|
"rootwait",
|
|
"ro",
|
|
"console=ttyAMA0"]
|
|
|
|
if init is not None:
|
|
kernel_cmdline.extend(["init={}".format(init)])
|
|
|
|
self.emulator.boot(arch="armv7",
|
|
kernel=kernel,
|
|
kernel_cmdline=kernel_cmdline,
|
|
options=options)
|
|
|
|
if init is None:
|
|
self.emulator.login()
|
|
|
|
def check_init(self, path):
|
|
cmd = "cmp /proc/1/exe {}".format(path)
|
|
self.assertRunOk(cmd)
|
|
|
|
def check_network(self, interface, exitCode=0):
|
|
cmd = "ip addr show {} |grep inet".format(interface)
|
|
_, exit_code = self.emulator.run(cmd)
|
|
self.assertEqual(exit_code, exitCode)
|