Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from project-chip:master #588

Merged
merged 220 commits into from
Aug 2, 2024

Conversation

pull[bot]
Copy link

@pull pull bot commented Jul 17, 2024

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

bzbarsky-apple and others added 2 commits July 17, 2024 06:31
* Removing these errors

* Restyled by clang-format

---------

Co-authored-by: Restyled.io <commits@restyled.io>
@pull pull bot added ⤵️ pull and removed darwin labels Jul 17, 2024
Regular update of nRF Connect SDK to 2.7.0 version.
* Choice conformance: Add conformance parsing

* Add to tests.yaml

* Restyled by autopep8

* Restyled by isort

* linter

* Update .github/workflows/tests.yaml

* wrap enum to contain choice, address review comments

* remove equality operator and check the member directly

---------

Co-authored-by: Restyled.io <commits@restyled.io>
…34354)

Currently, when calling an API which uses a future causes an error
(e.g. CommissionWithCode with an invalid code), then the API call
already returns an error. In this case the call `raise_on_error()` on
the returned PyChipError object make sure that an exception is raised.
However, this also causes the `CallbackContext` context manager to
exit.

At this point the future is initialized but never completed, which
triggers the previously introduced sanity check in `CallbackContext`:
`RuntimeError("CallbackContext future not completed")`.

Remove the RuntimeError as existing the context manager early without
completing the future is a use case (when the call setting up the
callback raises an exception).

Instead, just cancel the future in the context manager if it hasn't
been complete yet, in case someone has a reference to it and expects
it to complete.

Also, since most API calls return PyChipError, this changes
`CallAsync()` to raise an exception by default instead of returning a
PyChipError object. If the PyChipError object is required or an API
returns something else, the CallAsyncWithResult() method can be used.
* Add water-heater-mode-cluster.xml

* Add water-heater-mode-cluster support into control files and regenerate files

* Fix zap template generation issues

* Remove Water Heater Management entries

* Regenerate files

* Comment Water Heater Mode with right name

---------

Co-authored-by: jamesharrow <93921463+jamesharrow@users.noreply.github.com>
@github-actions github-actions bot added documentation Improvements or additions to documentation scripts app labels Jul 17, 2024
agners and others added 3 commits July 17, 2024 18:10
Allow to build the Python controller without host unit test config
enabled.
…sts. (#34378)

* Depend less on precise all-clusters-app endpoints layout in Darwin tests.

* test020_ReadMultipleAttributes and
  test021_ReadMultipleWildcardPathsIncludeUnsupportedAttribute were assuming
  three endpoints numbered 0, 1, 2. The fix is to just read the PartsList from
  the device instead of making assumptions.
* test033_TestMTRDeviceDeviceConfigurationChanged was assuming various things
  about which clusters are on which endpoints, as well as assuming that the
  PartsList of EP0 is _not_ [1, 2, 3].  Fix things so that we track which
  endpoint things are actually on, and make sure we take the PartsList from the
  device and add an entry that's not in it already to it instead of assuming its
  value.
* testDataStorageUpdatesWhenRemovingEndpoints was comparing arrays of endpoints,
  but some of those arrays come from enumerating dictionary keys.  Changing the
  set of keys can change their order.  The fix is to compare sets of endpoints
  instead.  Also, add asserts that the endpoint we are removing (2) is actually
  in the list, so that if that ever stops being true the test failure will be
  more understandable.

* Apply suggestions from code review

Co-authored-by: Kiel Oleson <kielo@apple.com>

---------

Co-authored-by: Kiel Oleson <kielo@apple.com>
* Add an Action Switch endpoint to all-clusters-app

- Action Switch is a new feature for a TCR
- Need to have the ZAP files updated before adding the logic to
  reduce review burden.
- Re-ran zap_convert_all.py (some of the changes are due to that)

Issue #34304

Testing done:

- No regressions of integration tests

* Fix integration test

* Try to fix Darwin tests

* Attempt to fix tests some more

* Fix Darwin tests

* Restyled by clang-format

* Fix the Darwin tests to actually pass.

* Fix typos

---------

Co-authored-by: Restyled.io <commits@restyled.io>
Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
andy31415 and others added 6 commits July 17, 2024 19:12
* Update namespace access for InteractionModel

* Undo change that is from other PR

* Pulled 2 more files

* Pulled one more file

---------

Co-authored-by: Andrei Litvin <andreilitvin@google.com>
Various changes have happened to ZAP and to .zap files without the script
running, so now we have some latent noise if someone edits one of those files.
Add documentation for all parameters of the Read/ReadAttribute/ReadEvent
functions in the Python controller.
* Mass update from chip-build:54 to chip-build:65. This is for chip-build image only.

* Noop change to force caches to be different across environments

* Use lsbrelease for the hash key

* Do not update paths that build python bits just yet: it seems we have some pybind dependencies

* Update one more python to not use the latest as it needs package updates

* Remove one more build update ... apparently TestPurposefulFailureExtraReportingOnToggle does not properly fail with latest python, this needs debugging

---------

Co-authored-by: Andrei Litvin <andreilitvin@google.com>
The sizes logged include payload and packet headers, so the size of the entire
Matter message.
nivi-apple and others added 3 commits July 31, 2024 16:49
* Dump details about leaked ExchangeContexts before aborting

This is implemented via a VerifyOrDieWithObject() variant of the existing
VerifyOrDie() macro that calls a DumpToLog() method on the provided object if
it exists (otherwise this is simply a no-op).

If CHIP_CONFIG_VERBOSE_VERIFY_OR_DIE is not enabled, VerifyOrDieWithObject()
simply behaves like a plain VerifyOrDie(). DumpToLog() implementations can use
ChipLogFormatRtti to log type information about an object (usually a delegate);
if RTTI is disabled this simply outputs whether the object was null or not.

* Address review comments

* Make gcc happy and improve documentation

* Remove unused include

* Fix compile error without CHIP_CONFIG_VERBOSE_VERIFY_OR_DIE

* Avoid unused parameter warning
* lwip pbuf, map file, and hex creation when OTA is disabled

* added cc13x4 family define around the non OTA hex creation

* whitespace fix

* reversed custom factoy data flash with cc13x4 check

* more whitespace fixes
@github-actions github-actions bot added the lwip label Aug 1, 2024
mkardous-silabs and others added 25 commits August 1, 2024 00:22
…4684)

* Add missing polling function to NoWifi connectivity manager

* Update GenericConnectivityManagerImpl_NoWiFi.h

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>

---------

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
* Add Q test

* Added test to test set

* Remove unused var

* Restyled by autopep8

* Restyled by isort

* Fix name

* Use pics over other method

* Removed unused stuff

* Added pipe commands

* Fix reset

* Get example to report appropriate changes.

* WiP

* Added some comments

* Changes to make things work

* Removed dev msgs

* Missed some

* Removed dev msgs

* Straggler

* Restyled by clang-format

* Restyled by autopep8

* Restyled by isort

* Commented unused var

* Update examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp

* Fix bug

---------

Co-authored-by: Restyled.io <commits@restyled.io>
* Bridged Device Information Cluster, Attribute ProductID test reflects marking as O, not X

* Update src/app/tests/suites/certification/Test_TC_BRBINFO_2_1.yaml

Co-authored-by: Terence Hampson <thampson@google.com>

* corrected pics

* corrected pics

* WIP Bridged ICD, commissioning to both fabrics

* wip testing sending KeepActive

* update to bridged-device-basic-information.xml and zap generated files

* removed unrelated file

---------

Co-authored-by: Terence Hampson <thampson@google.com>
Co-authored-by: Andrei Litvin <andy314@gmail.com>
* adding parallel execution to restyle-diff

* using xargs to call restyle-paths

* fixing Copyright year

* restyle the restyler
…r. (#34540)

* Adds things to the Unit Testing cluster XML.
* This requires those things to be enabled in all-clusters-app,
  all-clusters-minimal-app, and one of the chef contact sensors to pass CI.
* That requires an implementation in test-cluster-server
* At which point might as well add a YAML test to exercise it all.
* Pull request #1836: Cherry multi ota

Merge in WMN_TOOLS/matter from cherry-multi-ota to silabs_slc_1.3

Squashed commit of the following:

commit 4320bb46571658bc44fb82345348265def394991
Author: Michael Rupp <michael.rupp@silabs.com>
Date:   Fri May 10 14:26:07 2024 -0400

    remove some unwanted diffs in provision files

commit be160931dc600de7e7ead378b70d6a43c3945e46
Author: Michael Rupp <michael.rupp@silabs.com>
Date:   Fri May 10 14:24:25 2024 -0400

    revert changes to generator.project.mak

commit 14b6605887166e6d5284a61feb2bf407d850bdcf
Author: Michael Rupp <michael.rupp@silabs.com>
Date:   Fri May 10 13:06:12 2024 -0400

    revert NVM key changes and script changes

... and 8 more commits

* Restyled by whitespace

* Restyled by clang-format

* Restyled by gn

* Restyled by autopep8

* remove unused libs caught by linter

* update doctree with new readmes

* rerun CI, cirque failing for unknown reasons

* fix include guards in provision examples

* Restyled by clang-format

---------

Co-authored-by: Restyled.io <commits@restyled.io>
* Add python tests for Thermostat presets feature

* Restyled by autopep8

* Restyled by isort

* Update the PICS code for presets attribute

---------

Co-authored-by: Restyled.io <commits@restyled.io>
* Update the esp32 ci to use the latest docker version

* Added the CI fixes for ESP32 builds
* Add files via upload

* Update Test_TC_DRLK_2_1.yaml Aliro Attributes

* Update PICS.yaml for Aliro PICS

* Update PICS.yaml

* Update PICS.yaml-Formatting

* Update PICS.yaml

* Update Test_TC_DRLK_2_13.yaml -  PICS:PICS_SKIP_SAMPLE_APP

* Update Test_TC_DRLK_2_1.yaml-PICS_SKIP_SAMPLE_APP

* Update PICS.yaml

* Update PICS.yaml

* Update ci-pics-values-update DRLKA0080

* Update ci-pics-values-Aliro

* Update PICS.yaml

* Update ci-pics-values-Aliro Cmds and Feature PICS

* Update Test_TC_DRLK_2_13.yaml

* formatted using prettier

* Update PICS.yaml-prettier

* Update Test_TC_DRLK_2_13.yaml

* Update Test_TC_DRLK_2_1.yaml

* Restyled by prettier-yaml

* Update Test_TC_DRLK_2_13.yaml

* Update ciTests.json-Added DRLK 2.1 and 2.13

* Update ciTests.json

* Update ciTests.json

* Restyled by whitespace

* Restyled by prettier-json

* Update Test_TC_DRLK_2_1.yaml

fixed the values in the list as hex in step 41b
removed PICS_SKIP_SAMPLE_APP

* deleted DRLK_2_13 yaml file. will be covered in python script

* Update ci-pics-values

* Update PICS.yaml removed readonly type of PICS

* Update ci-pics-values-removed readonly pics

* Update ciTests.json-restored

* updated the Aliro labels without readonly , updated the ids to DRLK.S.A0028.ReadOnly and DRLK.S.A002c.ReadOnly

* Removed PICS for step 37

* Restyled by whitespace

* Restyled by prettier-yaml

---------

Co-authored-by: Restyled.io <commits@restyled.io>
Co-authored-by: chaitanya jandhyala <cjandhyala@apple.com>
* fixing mypy errors

* restyled

* add new files to BUILD.gn

* mypy: fixing p256keypair.py

* more mypy fixes

* adding workaround to allow type hinting ctypes pointers

* more mypy fixes

* more mypy fixes

* Restyled by autopep8

---------

Co-authored-by: Restyled.io <commits@restyled.io>
* Enable Aliro bits in example lock-app.

Fixes the FeatureMap on the cluster to enable the Aliro bits as well, and correctly marks
the parts that are implemented via AttributeAccessInterface.

* Adjust Test_TC_DRLK_2_9 to not fail when Aliro is supported.

* Fix issues in test script.
* Fix PICS code, add a test that was missed

* Editorial fix

---------

Co-authored-by: raju-apple <84206864+raju-apple@users.noreply.github.com>
* Occupancy Sensing cluster Python test scripts

Consolidate previous TC-OCC-xx test script PRs (PR 34490, PR 34491, PR 34492, PR 34523) into this one upload.

* Update TC_OCC_2_1.py

* Update TC_OCC_2_2.py

syntax error

* Update TC_OCC_2_3.py

* Update TC_OCC_3_1.py

* Update TC_OCC_3_2.py

* Update TC_OCC_2_1.py

Accommodated recent test plan attribute conformance and Cecille comments

* Update TC_OCC_2_2.py

Reflected table 2.7.6.2

* Update TC_OCC_2_3.py

Modified according to comments

* Update TC_OCC_3_1.py

Add CLI

* Update TC_OCC_3_2.py

Fixed some errors and added some random values for subscription testing

* Update TC_OCC_2_1.py

Updated more detail test step failure description.

* Update TC_OCC_3_1.py

Updating some of user input call according to comments.

* Update TC_OCC_2_1.py

python code bug fixing

* Update TC_OCC_2_2.py

python bug fixing

* Update TC_OCC_2_3.py

python bug fix

* Update TC_OCC_3_2.py

* Update TC_OCC_3_2.py

step numbering fix

* Update TC_OCC_3_2.py

* Update TC_OCC_3_2.py

* Update TC_OCC_3_1.py

* Update TC_OCC_2_3.py

* Update TC_OCC_2_2.py

* Update TC_OCC_2_1.py

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: C Freeman <cecille@google.com>

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: C Freeman <cecille@google.com>

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: C Freeman <cecille@google.com>

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: C Freeman <cecille@google.com>

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: C Freeman <cecille@google.com>

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: C Freeman <cecille@google.com>

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: C Freeman <cecille@google.com>

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: C Freeman <cecille@google.com>

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: C Freeman <cecille@google.com>

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: C Freeman <cecille@google.com>

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: C Freeman <cecille@google.com>

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: C Freeman <cecille@google.com>

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: C Freeman <cecille@google.com>

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: C Freeman <cecille@google.com>

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: C Freeman <cecille@google.com>

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: C Freeman <cecille@google.com>

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: C Freeman <cecille@google.com>

* Update TC_OCC_2_2.py

Fixed bitmap conditional statement

* Update TC_OCC_3_1.py

* Update TC_OCC_2_1.py

Add additional changes according to comments received.

* Update TC_OCC_3_1.py

* Update TC_OCC_3_2.py

test step change

* Update TC_OCC_2_1.py

* Update TC_OCC_2_1.py

* Update TC_OCC_2_1.py

* Update TC_OCC_2_1.py

* Update TC_OCC_2_1.py

* Update TC_OCC_2_1.py

update on PIR

* Update TC_OCC_2_2.py

* Update TC_OCC_2_1.py

restyled

* Update TC_OCC_2_2.py

restyled

* Update TC_OCC_2_3.py

restyled

* Update TC_OCC_3_1.py

restyled

* Update TC_OCC_3_2.py

restyled

* Update TC_OCC_2_1.py

* Update TC_OCC_2_1.py

* Update TC_OCC_2_1.py

* Restyle

* Update TC_OCC_2_2.py

bitmap conditional statement revised

* Update TC_OCC_2_2.py

Bitmap matching statement update

* Update TC_OCC_3_1.py

* Update src/python_testing/TC_OCC_2_2.py

typo

Co-authored-by: Andrei Litvin <andy314@gmail.com>

* Update src/python_testing/TC_OCC_2_2.py

Co-authored-by: Andrei Litvin <andy314@gmail.com>

* Update TC_OCC_2_2.py

* Update TC_OCC_2_2.py

* Update TC_OCC_2_2.py

rewriting sensor type check

* Update TC_OCC_2_2.py

* Update TC_OCC_2_2.py

* Update TC_OCC_2_2.py

* Restyle

* Proposal for TC_OCC bitmap compares

* Fix typo

* Fix map

* Update TC_OCC_3_2.py

added else on conditional statement.

* Update TC_OCC_3_2.py

put skip back

* Restyle

* Typo fixes and enable some tests in CI

* Fix OCC_2_1 to run in CI

* Fix all clusters for TC_OCC_2_2 and some logging

* make all TC_OCC_2_* pass

* Restyle

* Enable tests in ci

---------

Co-authored-by: C Freeman <cecille@google.com>
Co-authored-by: Andrei Litvin <andy314@gmail.com>
Co-authored-by: Andrei Litvin <andreilitvin@google.com>
Co-authored-by: Andrei Litvin <andreilitvin@google.com>
* Created automated test TC_ADMIN_1_9:
- Follows test steps in test plan PR #CHIP-Specifications/chip-test-plans#4267:
-- TH1 able to open commissioning window on DUT
-- TH2 Fails to connect to endpoint for 20 iterations with correct payload but incorrect passcode
-- TH2 Fails to connect to endpoint due to commissioning window being closed after the 20th failed attempt
-- TH1 able to open commissioning window on the endpoint again
-- TH1 able to revoke commissioning window on the endpoint

* Restyled by autopep8

* Updated TC_CADMIN_1_9 test:
- Replaced method to get incorrect pincode with using correct pincode in test step 4.

* Update src/python_testing/TC_CADMIN_1_9.py

Changing test async function to correct name, thank you Cecille!

Co-authored-by: C Freeman <cecille@google.com>

* Update src/python_testing/TC_CADMIN_1_9.py

Co-authored-by: C Freeman <cecille@google.com>

* Update src/python_testing/TC_CADMIN_1_9.py

Co-authored-by: C Freeman <cecille@google.com>

* Updated tests.yaml and TC_CADMIN_1_9.py:
- Added test module TC_CADMIN_1_9 into tests.yaml script
- Created new steps method to contain test steps, then call those in variables in main test code area.
- Inserted comment for why sleep time duration is needed between test steps 3 and 4, moved sleep time duration into main test code area
- Added setting variable for duration of commissioning window using maxCumulativeFailsafeSeconds

* Restyled by autopep8

* Updated TC_CADMIN_1_9 test module:
- added CI argument blocks to attempt to get test to run in CI

* Updated TC_CADMIN_1_9:
- Changed method for setting setupPinCode as in CI/CD pipeline it was failing previously.

* Restyled by autopep8

* Updated TC_CADMIN_1_9:
- Changed factory reset to false to attempt running in CI/CD pipeline

* Updated TC_CADMIN_1_9:
- Changed factory reset back to true as commissioning failed in CI/CD pipeline without it being set to true

* Updated TC_CADMIN_1_9:
- Removed PICS call in CI/CD as not needed
- Turned off quiet mode when running test in CI/CD pipeline to help flush out current issue

* Updated TC_CADMIN_1_9:
- Added back removing PICS from script args for running CI/CD pipeline to see if this gets pipeline working again.

* Updated TC_CADMIN_1_9:
- Added an additional await to see if we can get test to pass in CI/CD pipeline

* Updated TC_CADMIN_1_9:
- Changed method in which CommissionOnNetwork was being established, needed to run through asserts module.
- Added await async method for opening commissioning window.

* Updated TC_CADMIN_1_9:
- Turned quiet mode back on for CI/CD pipeline for this test as test is now passing.

---------

Co-authored-by: Restyled.io <commits@restyled.io>
Co-authored-by: C Freeman <cecille@google.com>
* Updated the golabl data type's XMLs, removing the cluster entries.

* Zap generated after XML update.

* Fixed namespaces used of global structs.

* Restyled by clang-format

---------

Co-authored-by: Restyled.io <commits@restyled.io>
…#34708)

* In progress

* ActionReturnStatus implementation

* Start making use of ActionReturnStatus

* Things seem to compile (but not yet passing)

* nice log formatting

* Propper formatting and comparisons in tests. Mock tests pass

* Restyle

* Restyle

* Fix typo

* Add missing files

* Added some unit tests that pass

* More tests

* Restyle

* Update src/app/codegen-data-model-provider/EmberMetadata.cpp

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>

* Update src/app/data-model-provider/ActionReturnStatus.h

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>

* Update src/app/data-model-provider/ActionReturnStatus.h

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>

* Update src/app/data-model-provider/ActionReturnStatus.h

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>

* Update src/lib/core/CHIPError.h

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>

* Rename IsOutOfSpaceError and do not document specifics

* Document invoke return codes

* Use the new out of space method in checked

* Restyle

* Allow ClusterStatusCode to be constructed from a CHIP_ERROR

* Format action statuses as c_str. HOWEVER this wastes 32 bytes of BSS

* Fix error formatting

* Restyle

* Fix includes to be system paths

* Update src/app/data-model-provider/Provider.h

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>

* Update src/app/data-model-provider/Provider.h

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>

* Fix status success and chip_no_error equivalence and add unit tests

* Added more tests

---------

Co-authored-by: Andrei Litvin <andreilitvin@google.com>
Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
The constructor is a better fit for being able to convert CHIP_ERROR to
ClusterStatusCode and then to StatusIB.
@woody-apple woody-apple merged commit 26c816a into woody-apple:master Aug 2, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment