github/falco
1
0
Fork 0
mirror of https://github.com/falcosecurity/falco.git synced 2025-07-18 00:31:30 +00:00
Code Issues Projects Releases Wiki Activity

update(test): account only for falco version in tests, not driver version

Browse Source 
Signed-off-by: Leonardo Di Donato <leodidonato@gmail.com>
This commit is contained in:
Leonardo Di Donato 2020-03-23 13:42:43 +00:00 committed by poiana
parent d3a215a2db
commit c1d840d471
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/tester/root/usr/bin/entrypoint
View File

@ -47,7 +47,7 @@ case "$CMD" in
"test") "test")
if [ -z "$FALCO_VERSION" ]; then if [ -z "$FALCO_VERSION" ]; then
echo "Automatically figuring out Falco version." echo "Automatically figuring out Falco version."
FALCO_VERSION=$("$BUILD_DIR/$BUILD_TYPE/userspace/falco/falco" --version | cut -d' ' -f3 | tr -d '\r') FALCO_VERSION=$("$BUILD_DIR/$BUILD_TYPE/userspace/falco/falco" --version | head -n 1 | cut -d' ' -f3 | tr -d '\r')
echo "Falco version: $FALCO_VERSION" echo "Falco version: $FALCO_VERSION"
fi fi
if [ -z "$FALCO_VERSION" ]; then if [ -z "$FALCO_VERSION" ]; then

5
test/falco_test.py
View File

@ -397,7 +397,8 @@ class FalcoTest(Test):
os.remove(rmfile) os.remove(rmfile)
if self.copy_local_driver: if self.copy_local_driver:
verstr = subprocess.check_output([self.falco_binary_path, "--version"]).rstrip() verlines = [str.strip() for str in subprocess.check_output([self.falco_binary_path, "--version"]).splitlines()]
verstr = verlines[0].decode("utf-8")
self.log.info("verstr {}".format(verstr)) self.log.info("verstr {}".format(verstr))
falco_version = verstr.split(" ")[2] falco_version = verstr.split(" ")[2]
self.log.info("falco_version {}".format(falco_version)) self.log.info("falco_version {}".format(falco_version))
@ -406,7 +407,7 @@ class FalcoTest(Test):
kernel_release = subprocess.check_output(["uname", "-r"]).rstrip() kernel_release = subprocess.check_output(["uname", "-r"]).rstrip()
self.log.info("kernel release {}".format(kernel_release)) self.log.info("kernel release {}".format(kernel_release))
# falco-probe-loader has a more comprehensive set of ways to # falco-driver-loader has a more comprehensive set of ways to
# find the config hash. We only look at /boot/config-<kernel release> # find the config hash. We only look at /boot/config-<kernel release>
md5_output = subprocess.check_output(["md5sum", "/boot/config-{}".format(kernel_release)]).rstrip() md5_output = subprocess.check_output(["md5sum", "/boot/config-{}".format(kernel_release)]).rstrip()
config_hash = md5_output.split(" ")[0] config_hash = md5_output.split(" ")[0]