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.

Sign up for GitHub

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

fix tv ( only supports ethernet commission ) always DeleteAllFabrics #13181

Merged
merged 2 commits into from
Jan 4, 2022
Merged

fix tv ( only supports ethernet commission ) always DeleteAllFabrics #13181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a541299
fix tv ( only supports ethernet commission ) always DeleteAllFabrics …
xylophone21 Dec 21, 2021
7ba0bb9
fix Linux test failed: remove all Fabrics before next testcase
xylophone21 Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions scripts/tests/chiptest/test_definition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ def Run(self, runner, paths: ApplicationPaths):
if os.path.exists('/tmp/chip_tool_config.ini'):
os.unlink('/tmp/chip_tool_config.ini')

# Remove server all_clusters_app or tv_app storage, so it will be commissionable again
if os.path.exists('/tmp/chip_kvs'):
os.unlink('/tmp/chip_kvs')

discriminator = str(randrange(1, 4096))
logging.debug(
'Executing application under test with discriminator %s.' % discriminator)
Expand Down
5 changes: 3 additions & 2 deletions src/app/server/Server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,13 @@ CHIP_ERROR Server::Init(AppDelegate * delegate, uint16_t secureServicePort, uint
ChipLogProgress(AppServer, "Rendezvous and secure pairing skipped");
SuccessOrExit(err = AddTestCommissioning());
}
else if ((DeviceLayer::ConnectivityMgr().IsWiFiStationProvisioned() || DeviceLayer::ConnectivityMgr().IsThreadProvisioned()) &&
(GetFabricTable().FabricCount() != 0))
else if (GetFabricTable().FabricCount() != 0)
{
// The device is already commissioned, proactively disable BLE advertisement.
ChipLogProgress(AppServer, "Fabric already commissioned. Disabling BLE advertisement");
#if CONFIG_NETWORK_LAYER_BLE
chip::DeviceLayer::ConnectivityMgr().SetBLEAdvertisingEnabled(false);
#endif
}
else
{
Expand Down