test: sharpen button label unit test

Using different strings for the device tree node labels and the label
property of buttons sharpens the button label unit test.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Philippe Reynes <philippe.reynes@softathome.com>

diff --git a/arch/sandbox/dts/sandbox.dtsi b/arch/sandbox/dts/sandbox.dtsi
index c76ecc013c98143b54b3be4d563bb90cd80b1d14..0faad3f3195429299ea7dc6d65a00a5235218eb5 100644 (file)
--- a/arch/sandbox/dts/sandbox.dtsi
+++ b/arch/sandbox/dts/sandbox.dtsi
@@ -18,14 +18,14 @@
        buttons {
                compatible = "gpio-keys";
 
-               summer {
+               btn1 {
                        gpios = <&gpio_a 3 0>;
-                       label = "summer";
+                       label = "button1";
                };
 
-               christmas {
+               btn2 {
                        gpios = <&gpio_a 4 0>;
-                       label = "christmas";
+                       label = "button2";
                };
        };
 

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index c7d137691163e664d34b87e0e72d64735a2a5774..fa84b2c10f3bc8af412478b3eede0c300de294b5 100644 (file)
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -55,14 +55,14 @@
        buttons {
                compatible = "gpio-keys";
 
-               summer {
+               btn1 {
                        gpios = <&gpio_a 3 0>;
-                       label = "summer";
+                       label = "button1";
                };
 
-               christmas {
+               btn2 {
                        gpios = <&gpio_a 4 0>;
-                       label = "christmas";
+                       label = "button2";
                };
        };
 

diff --git a/test/dm/button.c b/test/dm/button.c
index 911780173657570a508e67be3ed4420ea8eb0f0b..ecaa47cf5f355bbd0a8fc85ef33424be29012f88 100644 (file)
--- a/test/dm/button.c
+++ b/test/dm/button.c
@@ -57,17 +57,17 @@ static int dm_test_button_label(struct unit_test_state *uts)
 {
        struct udevice *dev, *cmp;
 
-       ut_assertok(button_get_by_label("summer", &dev));
+       ut_assertok(button_get_by_label("button1", &dev));
        ut_asserteq(1, device_active(dev));
        ut_assertok(uclass_get_device(UCLASS_BUTTON, 1, &cmp));
        ut_asserteq_ptr(dev, cmp);
 
-       ut_assertok(button_get_by_label("christmas", &dev));
+       ut_assertok(button_get_by_label("button2", &dev));
        ut_asserteq(1, device_active(dev));
        ut_assertok(uclass_get_device(UCLASS_BUTTON, 2, &cmp));
        ut_asserteq_ptr(dev, cmp);
 
-       ut_asserteq(-ENODEV, button_get_by_label("spring", &dev));
+       ut_asserteq(-ENODEV, button_get_by_label("nobutton", &dev));
 
        return 0;
 }

diff --git a/test/py/tests/test_button.py b/test/py/tests/test_button.py
index 98067a98f2896c8c7a0ae97fbda186ccce015c72..eadd9dd6135d058fd9759155309d3ac15cad511e 100644 (file)
--- a/test/py/tests/test_button.py
+++ b/test/py/tests/test_button.py
@@ -11,7 +11,7 @@ def test_button_exit_statuses(u_boot_console):
     expected_response = 'rc:0'
     response = u_boot_console.run_command('button list; echo rc:$?')
     assert(expected_response in response)
-    response = u_boot_console.run_command('button summer; echo rc:$?')
+    response = u_boot_console.run_command('button button1; echo rc:$?')
     assert(expected_response in response)
 
     expected_response = 'rc:1'