From: Francis Laniel <francis.laniel@amarulasolutions.com>
To: u-boot@lists.denx.de
Cc: Michael Nazzareno Trimarchi <michael@amarulasolutions.com>,
Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>,
Harald Seiler <hws@denx.de>,
Francis Laniel <francis.laniel@amarulasolutions.com>,
Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Subject: [RFC PATCH v8 03/23] test/py: hush_if_test: Remove the test file
Date: Fri, 12 May 2023 21:03:11 +0100 [thread overview]
Message-ID: <20230512200331.51457-4-francis.laniel@amarulasolutions.com> (raw)
In-Reply-To: <20230512200331.51457-1-francis.laniel@amarulasolutions.com>
5804ebfeb1ce ("test: hush: Test hush if/else") translated this test to a C test,
so this python file is no more needed.
Signed-off-by: Francis Laniel <francis.laniel@amarulasolutions.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
test/py/tests/test_hush_if_test.py | 197 -----------------------------
1 file changed, 197 deletions(-)
delete mode 100644 test/py/tests/test_hush_if_test.py
diff --git a/test/py/tests/test_hush_if_test.py b/test/py/tests/test_hush_if_test.py
deleted file mode 100644
index 3b4b6fcaf4..0000000000
--- a/test/py/tests/test_hush_if_test.py
+++ /dev/null
@@ -1,197 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved.
-
-# Test operation of the "if" shell command.
-
-import os
-import os.path
-import pytest
-
-# TODO: These tests should be converted to a C test.
-# For more information please take a look at the thread
-# https://lists.denx.de/pipermail/u-boot/2019-October/388732.html
-
-pytestmark = pytest.mark.buildconfigspec('hush_parser')
-
-# The list of "if test" conditions to test.
-subtests = (
- # Base if functionality.
-
- ('true', True),
- ('false', False),
-
- # Basic operators.
-
- ('test aaa = aaa', True),
- ('test aaa = bbb', False),
-
- ('test aaa != bbb', True),
- ('test aaa != aaa', False),
-
- ('test aaa < bbb', True),
- ('test bbb < aaa', False),
-
- ('test bbb > aaa', True),
- ('test aaa > bbb', False),
-
- ('test 123 -eq 123', True),
- ('test 123 -eq 456', False),
-
- ('test 123 -ne 456', True),
- ('test 123 -ne 123', False),
-
- ('test 123 -lt 456', True),
- ('test 123 -lt 123', False),
- ('test 456 -lt 123', False),
-
- ('test 123 -le 456', True),
- ('test 123 -le 123', True),
- ('test 456 -le 123', False),
-
- ('test 456 -gt 123', True),
- ('test 123 -gt 123', False),
- ('test 123 -gt 456', False),
-
- ('test 456 -ge 123', True),
- ('test 123 -ge 123', True),
- ('test 123 -ge 456', False),
-
- # Octal tests
-
- ('test 010 -eq 010', True),
- ('test 010 -eq 011', False),
-
- ('test 010 -ne 011', True),
- ('test 010 -ne 010', False),
-
- # Hexadecimal tests
-
- ('test 0x2000000 -gt 0x2000001', False),
- ('test 0x2000000 -gt 0x2000000', False),
- ('test 0x2000000 -gt 0x1ffffff', True),
-
- # Mixed tests
-
- ('test 010 -eq 10', False),
- ('test 010 -ne 10', True),
- ('test 0xa -eq 10', True),
- ('test 0xa -eq 012', True),
-
- ('test 2000000 -gt 0x1ffffff', False),
- ('test 0x2000000 -gt 1ffffff', True),
- ('test 0x2000000 -lt 1ffffff', False),
- ('test 0x2000000 -eq 2000000', False),
- ('test 0x2000000 -ne 2000000', True),
-
- ('test -z ""', True),
- ('test -z "aaa"', False),
-
- ('test -n "aaa"', True),
- ('test -n ""', False),
-
- # Inversion of simple tests.
-
- ('test ! aaa = aaa', False),
- ('test ! aaa = bbb', True),
- ('test ! ! aaa = aaa', True),
- ('test ! ! aaa = bbb', False),
-
- # Binary operators.
-
- ('test aaa != aaa -o bbb != bbb', False),
- ('test aaa != aaa -o bbb = bbb', True),
- ('test aaa = aaa -o bbb != bbb', True),
- ('test aaa = aaa -o bbb = bbb', True),
-
- ('test aaa != aaa -a bbb != bbb', False),
- ('test aaa != aaa -a bbb = bbb', False),
- ('test aaa = aaa -a bbb != bbb', False),
- ('test aaa = aaa -a bbb = bbb', True),
-
- # Inversion within binary operators.
-
- ('test ! aaa != aaa -o ! bbb != bbb', True),
- ('test ! aaa != aaa -o ! bbb = bbb', True),
- ('test ! aaa = aaa -o ! bbb != bbb', True),
- ('test ! aaa = aaa -o ! bbb = bbb', False),
-
- ('test ! ! aaa != aaa -o ! ! bbb != bbb', False),
- ('test ! ! aaa != aaa -o ! ! bbb = bbb', True),
- ('test ! ! aaa = aaa -o ! ! bbb != bbb', True),
- ('test ! ! aaa = aaa -o ! ! bbb = bbb', True),
-)
-
-def exec_hush_if(u_boot_console, expr, result):
- """Execute a shell "if" command, and validate its result."""
-
- config = u_boot_console.config.buildconfig
- maxargs = int(config.get('config_sys_maxargs', '0'))
- args = len(expr.split(' ')) - 1
- if args > maxargs:
- u_boot_console.log.warning('CONFIG_SYS_MAXARGS too low; need ' +
- str(args))
- pytest.skip()
-
- cmd = 'if ' + expr + '; then echo true; else echo false; fi'
- response = u_boot_console.run_command(cmd)
- assert response.strip() == str(result).lower()
-
-@pytest.mark.buildconfigspec('cmd_echo')
-@pytest.mark.parametrize('expr,result', subtests)
-def test_hush_if_test(u_boot_console, expr, result):
- """Test a single "if test" condition."""
-
- exec_hush_if(u_boot_console, expr, result)
-
-def test_hush_z(u_boot_console):
- """Test the -z operator"""
- u_boot_console.run_command('setenv ut_var_nonexistent')
- u_boot_console.run_command('setenv ut_var_exists 1')
- exec_hush_if(u_boot_console, 'test -z "$ut_var_nonexistent"', True)
- exec_hush_if(u_boot_console, 'test -z "$ut_var_exists"', False)
- u_boot_console.run_command('setenv ut_var_exists')
-
-# We might test this on real filesystems via UMS, DFU, 'save', etc.
-# Of those, only UMS currently allows file removal though.
-@pytest.mark.buildconfigspec('cmd_echo')
-@pytest.mark.boardspec('sandbox')
-def test_hush_if_test_host_file_exists(u_boot_console):
- """Test the "if test -e" shell command."""
-
- test_file = u_boot_console.config.result_dir + \
- '/creating_this_file_breaks_u_boot_tests'
-
- try:
- os.unlink(test_file)
- except:
- pass
- assert not os.path.exists(test_file)
-
- expr = 'test -e hostfs - ' + test_file
- exec_hush_if(u_boot_console, expr, False)
-
- try:
- with open(test_file, 'wb'):
- pass
- assert os.path.exists(test_file)
-
- expr = 'test -e hostfs - ' + test_file
- exec_hush_if(u_boot_console, expr, True)
- finally:
- os.unlink(test_file)
-
- expr = 'test -e hostfs - ' + test_file
- exec_hush_if(u_boot_console, expr, False)
-
-def test_hush_var(u_boot_console):
- """Test the set and unset of variables"""
- u_boot_console.run_command('ut_var_nonexistent=')
- u_boot_console.run_command('ut_var_exists=1')
- u_boot_console.run_command('ut_var_unset=1')
- exec_hush_if(u_boot_console, 'test -z "$ut_var_nonexistent"', True)
- exec_hush_if(u_boot_console, 'test -z "$ut_var_exists"', False)
- exec_hush_if(u_boot_console, 'test -z "$ut_var_unset"', False)
- exec_hush_if(u_boot_console, 'ut_var_unset=', True)
- exec_hush_if(u_boot_console, 'test -z "$ut_var_unset"', True)
- u_boot_console.run_command('ut_var_exists=')
- u_boot_console.run_command('ut_var_unset=')
--
2.34.1
next prev parent reply other threads:[~2023-05-12 20:06 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-12 20:03 [RFC PATCH v8 00/23] Modernize U-Boot shell Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 01/23] test: Add framework to test hush behavior Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 02/23] test: hush: Test hush if/else Francis Laniel
2023-05-12 20:03 ` Francis Laniel [this message]
2023-05-12 20:03 ` [RFC PATCH v8 04/23] test: hush: Test hush variable expansion Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 05/23] test: hush: Test hush commands list Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 06/23] test: hush: Test hush loops Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 07/23] cli: Add Busybox upstream hush.c file Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 08/23] cli: Port Busybox 2021 hush to U-Boot Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 09/23] cli: Add menu for hush parser Francis Laniel
2023-05-13 1:03 ` Heinrich Schuchardt
2023-05-13 20:32 ` Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 10/23] global_data.h: add GD_FLG_HUSH_OLD_PARSER flag Francis Laniel
2023-05-13 1:07 ` Heinrich Schuchardt
2023-05-13 20:29 ` Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 11/23] cmd: Add new cli command Francis Laniel
2023-05-13 1:18 ` Heinrich Schuchardt
2023-05-13 20:17 ` Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 12/23] cli: Enables using hush 2021 parser as command line parser Francis Laniel
2023-05-13 1:19 ` Heinrich Schuchardt
2023-05-25 8:19 ` Patrick DELAUNAY
2023-05-12 20:03 ` [RFC PATCH v8 13/23] cli: hush_2021: Enable variables expansion for hush 2021 Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 14/23] cli: hush_2021: Add functions to be called from run_command() Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 15/23] cli: add hush 2021 as parser for run_command*() Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 16/23] test: hush: Fix instructions list tests for hush 2021 Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 17/23] test: hush: Fix variable expansion " Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 18/23] cli: hush_2021: Enable using < and > as string compare operators Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 19/23] cli: hush_2021: Enable if keyword Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 20/23] cli: hush_2021: Enable loops Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 21/23] test: hush: Fix loop tests for hush 2021 Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 22/23] cli: hush_2021: Add upstream commits up to 9th May 2023 Francis Laniel
2023-05-12 20:03 ` [RFC PATCH v8 23/23] DO NOT MERGE: only to make CI happy Francis Laniel
2023-05-12 20:44 ` Tony Dinh
2023-05-13 9:54 ` [RFC PATCH v8 00/23] Modernize U-Boot shell Peter Robinson
2023-05-13 21:42 ` Francis Laniel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230512200331.51457-4-francis.laniel@amarulasolutions.com \
--to=francis.laniel@amarulasolutions.com \
--cc=hws@denx.de \
--cc=michael@amarulasolutions.com \
--cc=sjg@chromium.org \
--cc=stefan.herbrechtsmeier@weidmueller.com \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox