diff options
| author | YH Lin <yueherngl@chromium.org> | 2022-12-03 00:17:55 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-12-05 17:43:18 +0000 |
| commit | dd732876495ed4942d00b9f9ca8dd3b01bad7120 (patch) | |
| tree | bdff671e5ad3e71e30ab56f4f084f34a2fd72e28 /zephyr/test/drivers/default/src/console_cmd/charge_state.c | |
| parent | 184d13e77614be3be5374d3fef9d1edf66ec8687 (diff) | |
| download | chrome-ec-factory-brya-14909.124.B-main.tar.gz | |
Revert "Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main"factory-brya-14909.124.B-main
This reverts commit 184d13e77614be3be5374d3fef9d1edf66ec8687.
Reason for revert: broken build due to ec-utils.
Original change's description:
> Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main
>
> Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
> baseboard/brya/relevant-paths.txt factory-brya-14909.124.B-main
>
> Relevant changes:
>
> git log --oneline 19d4d68ffa..aa40b859b3 -- baseboard/brya board/agah
> board/anahera board/banshee board/brya board/crota board/felwinter
> board/gimble board/kano board/mithrax board/osiris board/primus
> board/redrix board/taeko board/taniks board/vell board/volmar
> driver/bc12/pi3usb9201_public.* driver/charger/bq25710.*
> driver/ppc/nx20p348x.* driver/ppc/syv682x_public.*
> driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.*
> driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake*
> include/intel_x86.h power/alderlake* power/intel_x86.c
> util/getversion.sh
>
> e6da633c38 driver: Sort header files
> 234a87ae2d tcpci: Add FRS enable to driver structure
> a56be59ccd tcpm_header: add test for tcpm_dump_registers
> 57b3256963 Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT
> e420c8ff9a marasov: Modify TypeC and TypeA configuration.
> 43b53e0045 Add default implementation of board_set_charge_limit
> b75dc90677 Add CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT
> f1b563c350 baseboard: Sort header files
> 7d01b1e58d driver/retimer/ps8818.h: Add I2C ADDR FLAGS 0x30, 0x58, 0x70
> ec31407993 Add CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT
> 8f89f69a5b crota: disable lid angle sensor for clamshell
>
> BRANCH=None
> BUG=b:260630630 b:163093572 b:259002141 b:255184961 b:259354679
> BUG=b:247100970 b:254328661
> TEST=`emerge-brya chromeos-ec`
>
> Force-Relevant-Builds: all
> Change-Id: I0ecfa0e6af68631283c7a9e8f1afb9d827176c62
> Signed-off-by: YH Lin <yueherngl@google.com>
Bug: b:260630630 b:163093572 b:259002141 b:255184961 b:259354679
Bug: b:247100970 b:254328661
Change-Id: Ia14942d1bd6a502062399d77cb59d1f4b549b2c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4077247
Auto-Submit: YH Lin <yueherngl@chromium.org>
Tested-by: YH Lin <yueherngl@chromium.org>
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Commit-Queue: YH Lin <yueherngl@chromium.org>
Diffstat (limited to 'zephyr/test/drivers/default/src/console_cmd/charge_state.c')
| -rw-r--r-- | zephyr/test/drivers/default/src/console_cmd/charge_state.c | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/zephyr/test/drivers/default/src/console_cmd/charge_state.c b/zephyr/test/drivers/default/src/console_cmd/charge_state.c index 8cfd11324f..7ee91049ae 100644 --- a/zephyr/test/drivers/default/src/console_cmd/charge_state.c +++ b/zephyr/test/drivers/default/src/console_cmd/charge_state.c @@ -3,6 +3,9 @@ * found in the LICENSE file. */ +#include <zephyr/shell/shell.h> +#include <zephyr/ztest.h> + #include "charge_state.h" #include "charge_state_v2.h" #include "console.h" @@ -10,9 +13,6 @@ #include "test/drivers/test_state.h" #include "test/drivers/utils.h" -#include <zephyr/shell/shell.h> -#include <zephyr/ztest.h> - ZTEST_USER(console_cmd_charge_state, test_idle_too_few_args) { int rv; @@ -116,7 +116,7 @@ ZTEST_USER(console_cmd_charge_state, test_debug_on_show_charging_progress) charging_progress_displayed(); /* Enable debug printing */ - zassert_ok(shell_execute_cmd(get_ec_shell(), "chgstate debug on"), + zassume_ok(shell_execute_cmd(get_ec_shell(), "chgstate debug on"), NULL); /* Sleep at least 1 full iteration of the charge state loop */ @@ -159,16 +159,6 @@ ZTEST_USER(console_cmd_charge_state, test_sustain_invalid_params) zassert_equal(shell_execute_cmd(get_ec_shell(), "chgstate sustain 50 101"), EC_ERROR_INVAL, NULL); - - /* Verify invalid lower bound (not a number) */ - zassert_equal(shell_execute_cmd(get_ec_shell(), - "chgstate sustain a 50"), - EC_ERROR_PARAM2); - - /* Verify invalid uppoer bound (not a number) */ - zassert_equal(shell_execute_cmd(get_ec_shell(), - "chgstate sustain 30 a"), - EC_ERROR_PARAM3); } struct console_cmd_charge_state_fixture { @@ -216,7 +206,7 @@ ZTEST_USER_F(console_cmd_charge_state, test_idle_on_from_normal) fixture->tcpci_emul, fixture->charger_emul); /* Verify that we're in "normal" mode */ - zassert_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL); + zassume_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL); /* Move to idle */ zassert_ok(shell_execute_cmd(get_ec_shell(), "chgstate idle on")); @@ -230,11 +220,11 @@ ZTEST_USER_F(console_cmd_charge_state, test_normal_from_idle) fixture->tcpci_emul, fixture->charger_emul); /* Verify that we're in "normal" mode */ - zassert_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL); + zassume_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL); /* Move to idle */ - zassert_ok(shell_execute_cmd(get_ec_shell(), "chgstate idle on")); - zassert_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_IDLE); + zassume_ok(shell_execute_cmd(get_ec_shell(), "chgstate idle on")); + zassume_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_IDLE); /* Move back to normal */ zassert_ok(shell_execute_cmd(get_ec_shell(), "chgstate idle off"), @@ -249,7 +239,7 @@ ZTEST_USER_F(console_cmd_charge_state, test_discharge_on) fixture->tcpci_emul, fixture->charger_emul); /* Verify that we're in "normal" mode */ - zassert_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL); + zassume_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL); /* Enable discharge */ zassert_ok(shell_execute_cmd(get_ec_shell(), "chgstate discharge on"), @@ -264,12 +254,12 @@ ZTEST_USER_F(console_cmd_charge_state, test_discharge_off) fixture->tcpci_emul, fixture->charger_emul); /* Verify that we're in "normal" mode */ - zassert_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL); + zassume_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL); /* Enable discharge */ - zassert_ok(shell_execute_cmd(get_ec_shell(), "chgstate discharge on"), + zassume_ok(shell_execute_cmd(get_ec_shell(), "chgstate discharge on"), NULL); - zassert_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_DISCHARGE); + zassume_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_DISCHARGE); /* Disable discharge */ zassert_ok(shell_execute_cmd(get_ec_shell(), "chgstate discharge off"), |