Merge branch 'add_presets_to_Sdk' of github.com:hasty/connectedhomeip into add_presets_to_Sdk

Author: hasty

scripts/helpers/restyle-diff.sh

@@ -21,9 +21,10 @@
 #  you've written is kosher to CI
 #
 # Usage:
-#  restyle-diff.sh [ref]
+#  restyle-diff.sh [-d] [ref]
 #
 # if unspecified, ref defaults to upstream/master (or master)
+# -d sets container's log level to DEBUG, if unspecified the default log level will remain (info level)
 #
 
 here=${0%/*}
@@ -33,20 +34,55 @@ set -e
 CHIP_ROOT=$(cd "$here/../.." && pwd)
 cd "$CHIP_ROOT"
 
-restyle-paths() {
-    if hash restyle-path 2>/dev/null; then
-        echo "$@" | xargs restyle-path
+docker_run() {
+    if [ -t 0 ]; then
+        exec docker run --tty "$@"
+
     else
-        url=https://github.com/restyled-io/restyler/raw/main/bin/restyle-path
-        echo "$@" | xargs sh <(curl --location --proto "=https" --tlsv1.2 "$url" -sSf)
+        exec docker run "$@"
+
     fi
 }
 
-ref="$1"
+restyle-paths() {
+
+    image=restyled/restyler:edge
+
+    for path in "$@"; do
+        (
+            docker_run --tty --interactive --rm \
+                --env LOG_LEVEL \
+                --env LOG_DESTINATION \
+                --env LOG_FORMAT \
+                --env LOG_COLOR \
+                --env HOST_DIRECTORY="$PWD" \
+                --env UNRESTRICTED=1 \
+                --volume "$PWD":/code \
+                --volume /tmp:/tmp \
+                --volume /var/run/docker.sock:/var/run/docker.sock \
+                --entrypoint restyle-path \
+                "$image" "$path"
+        )
+    done
+}
+
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        -d)
+            export LOG_LEVEL="DEBUG"
+            shift
+            ;;
+        *)
+            ref="$1"
+            shift
+            ;;
+    esac
+done
+
 if [[ -z "$ref" ]]; then
     ref="master"
     git remote | grep -qxF upstream && ref="upstream/master"
 fi
 
-declare -a paths=("$(git diff --ignore-submodules --name-only --merge-base "$ref")")
+mapfile -t paths < <(git diff --ignore-submodules --name-only --merge-base "$ref")
 restyle-paths "${paths[@]}"

src/python_testing/matter_testing_support.py

@@ -1815,7 +1815,7 @@ def per_endpoint_test(accept_function: EndpointCheckFunction):
     def per_endpoint_test_internal(body):
         def per_endpoint_runner(self: MatterBaseTest, *args, **kwargs):
             asserts.assert_false(self.get_test_pics(self.current_test_info.name), "pics_ method supplied for per_endpoint_test.")
-            runner_with_timeout = asyncio.wait_for(get_accepted_endpoints_for_test(self, accept_function), timeout=5)
+            runner_with_timeout = asyncio.wait_for(get_accepted_endpoints_for_test(self, accept_function), timeout=30)
             endpoints = asyncio.run(runner_with_timeout)
             if not endpoints:
                 logging.info("No matching endpoints found - skipping test")