test/py: test the shell if command

Migrate all most tests from command_ut.c into the Python test system.
This allows the tests to be run against any U-Boot binary that supports
the if command (i.e. where hush is enabled) without requiring that
binary to be permanently bloated with the code from command_ut.

Some tests in command_ut.c can only be executed from C code, since they
test internal (more unit-level) features of various U-Boot APIs. The
migrated tests can all operate directly from the U-Boot console.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/test/command_ut.c b/test/command_ut.c
index 43bd2c1771fecf43fc7c5044f61af56516534ec1..54bf62b9bc301a5e1c2bdfa0be8224d33852acda 100644 (file)
--- a/test/command_ut.c
+++ b/test/command_ut.c
@@ -7,9 +7,6 @@
 #define DEBUG
 
 #include <common.h>
-#ifdef CONFIG_SANDBOX
-#include <os.h>
-#endif
 
 static const char test_cmd[] = "setenv list 1\n setenv list ${list}2; "
                "setenv list ${list}3\0"
@@ -20,13 +17,6 @@ static int do_ut_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        printf("%s: Testing commands\n", __func__);
        run_command("env default -f -a", 0);
 
-       /* make sure that compound statements work */
-#ifdef CONFIG_SYS_HUSH_PARSER
-       run_command("if test -n ${single} ; then setenv check 1; fi", 0);
-       assert(!strcmp("1", getenv("check")));
-       run_command("setenv check", 0);
-#endif
-
        /* commands separated by \n */
        run_command_list("setenv list 1\n setenv list ${list}1", -1, 0);
        assert(!strcmp("11", getenv("list")));
@@ -60,112 +50,6 @@ static int do_ut_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        assert(!strcmp("1", getenv("black")));
        assert(getenv("adder") != NULL);
        assert(!strcmp("2", getenv("adder")));
-
-       /* Test the 'test' command */
-
-#define HUSH_TEST(name, expr, expected_result) \
-       run_command("if test " expr " ; then " \
-                       "setenv " #name "_" #expected_result " y; else " \
-                       "setenv " #name "_" #expected_result " n; fi", 0); \
-       assert(!strcmp(#expected_result, getenv(#name "_" #expected_result))); \
-       setenv(#name "_" #expected_result, NULL);
-
-       /* Basic operators */
-       HUSH_TEST(streq, "aaa = aaa", y);
-       HUSH_TEST(streq, "aaa = bbb", n);
-
-       HUSH_TEST(strneq, "aaa != bbb", y);
-       HUSH_TEST(strneq, "aaa != aaa", n);
-
-       HUSH_TEST(strlt, "aaa < bbb", y);
-       HUSH_TEST(strlt, "bbb < aaa", n);
-
-       HUSH_TEST(strgt, "bbb > aaa", y);
-       HUSH_TEST(strgt, "aaa > bbb", n);
-
-       HUSH_TEST(eq, "123 -eq 123", y);
-       HUSH_TEST(eq, "123 -eq 456", n);
-
-       HUSH_TEST(ne, "123 -ne 456", y);
-       HUSH_TEST(ne, "123 -ne 123", n);
-
-       HUSH_TEST(lt, "123 -lt 456", y);
-       HUSH_TEST(lt_eq, "123 -lt 123", n);
-       HUSH_TEST(lt, "456 -lt 123", n);
-
-       HUSH_TEST(le, "123 -le 456", y);
-       HUSH_TEST(le_eq, "123 -le 123", y);
-       HUSH_TEST(le, "456 -le 123", n);
-
-       HUSH_TEST(gt, "456 -gt 123", y);
-       HUSH_TEST(gt_eq, "123 -gt 123", n);
-       HUSH_TEST(gt, "123 -gt 456", n);
-
-       HUSH_TEST(ge, "456 -ge 123", y);
-       HUSH_TEST(ge_eq, "123 -ge 123", y);
-       HUSH_TEST(ge, "123 -ge 456", n);
-
-       HUSH_TEST(z, "-z \"\"", y);
-       HUSH_TEST(z, "-z \"aaa\"", n);
-
-       HUSH_TEST(n, "-n \"aaa\"", y);
-       HUSH_TEST(n, "-n \"\"", n);
-
-       /* Inversion of simple tests */
-       HUSH_TEST(streq_inv, "! aaa = aaa", n);
-       HUSH_TEST(streq_inv, "! aaa = bbb", y);
-
-       HUSH_TEST(streq_inv_inv, "! ! aaa = aaa", y);
-       HUSH_TEST(streq_inv_inv, "! ! aaa = bbb", n);
-
-       /* Binary operators */
-       HUSH_TEST(or_0_0, "aaa != aaa -o bbb != bbb", n);
-       HUSH_TEST(or_0_1, "aaa != aaa -o bbb = bbb", y);
-       HUSH_TEST(or_1_0, "aaa = aaa -o bbb != bbb", y);
-       HUSH_TEST(or_1_1, "aaa = aaa -o bbb = bbb", y);
-
-       HUSH_TEST(and_0_0, "aaa != aaa -a bbb != bbb", n);
-       HUSH_TEST(and_0_1, "aaa != aaa -a bbb = bbb", n);
-       HUSH_TEST(and_1_0, "aaa = aaa -a bbb != bbb", n);
-       HUSH_TEST(and_1_1, "aaa = aaa -a bbb = bbb", y);
-
-       /* Inversion within binary operators */
-       HUSH_TEST(or_0_0_inv, "! aaa != aaa -o ! bbb != bbb", y);
-       HUSH_TEST(or_0_1_inv, "! aaa != aaa -o ! bbb = bbb", y);
-       HUSH_TEST(or_1_0_inv, "! aaa = aaa -o ! bbb != bbb", y);
-       HUSH_TEST(or_1_1_inv, "! aaa = aaa -o ! bbb = bbb", n);
-
-       HUSH_TEST(or_0_0_inv_inv, "! ! aaa != aaa -o ! ! bbb != bbb", n);
-       HUSH_TEST(or_0_1_inv_inv, "! ! aaa != aaa -o ! ! bbb = bbb", y);
-       HUSH_TEST(or_1_0_inv_inv, "! ! aaa = aaa -o ! ! bbb != bbb", y);
-       HUSH_TEST(or_1_1_inv_inv, "! ! aaa = aaa -o ! ! bbb = bbb", y);
-
-       setenv("ut_var_nonexistent", NULL);
-       setenv("ut_var_exists", "1");
-       HUSH_TEST(z_varexp_quoted, "-z \"$ut_var_nonexistent\"", y);
-       HUSH_TEST(z_varexp_quoted, "-z \"$ut_var_exists\"", n);
-       setenv("ut_var_exists", NULL);
-
-       run_command("setenv ut_var_space \" \"", 0);
-       assert(!strcmp(getenv("ut_var_space"), " "));
-       run_command("setenv ut_var_test $ut_var_space", 0);
-       assert(!getenv("ut_var_test"));
-       run_command("setenv ut_var_test \"$ut_var_space\"", 0);
-       assert(!strcmp(getenv("ut_var_test"), " "));
-       run_command("setenv ut_var_test \" 1${ut_var_space}${ut_var_space} 2 \"", 0);
-       assert(!strcmp(getenv("ut_var_test"), " 1   2 "));
-       setenv("ut_var_space", NULL);
-       setenv("ut_var_test", NULL);
-
-#ifdef CONFIG_SANDBOX
-       /* File existence */
-       HUSH_TEST(e, "-e hostfs - creating_this_file_breaks_uboot_unit_test", n);
-       run_command("sb save hostfs - creating_this_file_breaks_uboot_unit_test 0 1", 0);
-       HUSH_TEST(e, "-e hostfs - creating_this_file_breaks_uboot_unit_test", y);
-       /* Perhaps this could be replaced by an "rm" shell command one day */
-       assert(!os_unlink("creating_this_file_breaks_uboot_unit_test"));
-       HUSH_TEST(e, "-e hostfs - creating_this_file_breaks_uboot_unit_test", n);
-#endif
 #endif
 
        assert(run_command("", 0) == 0);

diff --git a/test/py/tests/test_hush_if_test.py b/test/py/tests/test_hush_if_test.py
new file mode 100644 (file)
index 0000000..cf4c3ae
--- /dev/null
+++ b/test/py/tests/test_hush_if_test.py
@@ -0,0 +1,154 @@
+# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved.
+#
+# SPDX-License-Identifier: GPL-2.0
+
+# Test operation of the "if" shell command.
+
+import os
+import os.path
+import pytest
+
+# 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),
+
+    ('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),
+
+    # -z operator.
+
+    ('test -z "$ut_var_nonexistent"', True),
+    ('test -z "$ut_var_exists"', False),
+)
+
+def exec_hush_if(u_boot_console, expr, result):
+    '''Execute a shell "if" command, and validate its result.'''
+
+    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('sys_hush_parser')
+def test_hush_if_test_setup(u_boot_console):
+    '''Set up environment variables used during the "if" tests.'''
+
+    u_boot_console.run_command('setenv ut_var_nonexistent')
+    u_boot_console.run_command('setenv ut_var_exists 1')
+
+@pytest.mark.buildconfigspec('sys_hush_parser')
+@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)
+
+@pytest.mark.buildconfigspec('sys_hush_parser')
+def test_hush_if_test_teardown(u_boot_console):
+    '''Clean up environment variables used during the "if" tests.'''
+
+    u_boot_console.run_command('setenv ut_var_exists')
+
+@pytest.mark.buildconfigspec('sys_hush_parser')
+# We might test this on real filesystems via UMS, DFU, 'save', etc.
+# Of those, only UMS currently allows file removal though.
+@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 file(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)