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

Jump to bottom

connectivity-netsocket-tests-tests-network-wifi test suite configuration simplification #15031

Merged
merged 2 commits into from
Sep 9, 2021
Merged

connectivity-netsocket-tests-tests-network-wifi test suite configuration simplification #15031

merged 2 commits into from
Sep 9, 2021

Conversation

jeromecoutant
Copy link
Collaborator

Summary of changes

Goal is to simplify connectivity-netsocket-tests-tests-network-wifi test suite configuration.

In the current mbed_app.json file, we need to duplicate wifi network information in order to execute:

  • connectivity-netsocket-tests-tests-network-wifi
  • and connectivity-netsocket-tests-tests-netsocket-* tests

Impact of changes

None: all settings can still be configured for this specific test suite as before.

But if they are not set, default NSAPI configuration is used as for other netsocket tests.

Migration actions required

Documentation

Pull request type 

[x] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results 

[] No Tests required for this change (E.g docs only update)
[x] Covered by existing mbed-os tests (Greentea or Unittest)
[] Tests / results supplied as part of this PR

Reviewers

@ciarmcom ciarmcom added the release-type: patch Indentifies a PR as containing just a patch label Aug 31, 2021
@ciarmcom ciarmcom requested a review from a team August 31, 2021 10:30
@ciarmcom
Copy link
Member

@jeromecoutant, thank you for your changes.
@ARMmbed/mbed-os-maintainers please review.

@0xc0170 0xc0170 requested a review from a team September 1, 2021 12:28
@0xc0170
Copy link
Contributor

0xc0170 commented Sep 1, 2021

Please rebase to the latest master to get github workflow update to fix basic checks

@jeromecoutant
Copy link
Collaborator Author

Rebased

0xc0170
0xc0170 reviewed Sep 1, 2021
View reviewed changes
connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_disconnect_repeat.cpp
@@ -34,8 +34,10 @@ void wifi_connect_disconnect_repeat(void)
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);

for (int i = 0; i < 10; i++) {
printf("#%u connecting...\n", i);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add separate commit for adding these debug messages (I would like to understand why are they being added)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@0xc0170 Done

@ciarmcom ciarmcom added the stale Stale Pull Request label Sep 7, 2021
@ciarmcom
Copy link
Member

ciarmcom commented Sep 7, 2021

This pull request has automatically been marked as stale because it has had no recent activity. @ARMmbed/mbed-os-connectivity, please complete review of the changes to move the PR forward. Thank you for your contributions.

@0xc0170 0xc0170 self-requested a review September 7, 2021 07:57
0xc0170
0xc0170 previously approved these changes Sep 7, 2021
View reviewed changes
@mergify mergify bot added needs: CI and removed needs: review labels Sep 7, 2021
@ciarmcom ciarmcom removed the stale Stale Pull Request label Sep 7, 2021
pan-
pan- previously approved these changes Sep 8, 2021
View reviewed changes
connectivity/netsocket/tests/TESTS/network/wifi/get_security.cpp Outdated
@@ -47,6 +47,10 @@ nsapi_security get_security()
if (strcmp(MBED_CONF_APP_WIFI_SECURE_PROTOCOL, SEC_WPA3_WPA2) == 0) {
return NSAPI_SECURITY_WPA3_WPA2;
}
#elif defined MBED_CONF_NSAPI_DEFAULT_WIFI_SECURITY
#define concat_(x,y) x##y
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use MBED_CONCAT:

mbed-os/platform/include/platform/mbed_preprocessor.h

Line 39 in 3031898

#define MBED_CONCAT(a, b) MBED_CONCAT_(a, b)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK
Note this was a copy paste from https://github.com/ARMmbed/mbed-os/blob/master/connectivity/netsocket/source/NetworkInterfaceDefaults.cpp#L88-L89 :-)

@mergify mergify bot dismissed stale reviews from 0xc0170 and pan- September 8, 2021 14:56

Pull request has been modified.

@ciarmcom ciarmcom added the stale Stale Pull Request label Sep 8, 2021
@ciarmcom
Copy link
Member

ciarmcom commented Sep 8, 2021

This pull request has automatically been marked as stale because it has had no recent activity. @ARMmbed/mbed-os-maintainers, please start CI to get the PR merged.

@0xc0170 0xc0170 removed the stale Stale Pull Request label Sep 9, 2021
0xc0170
0xc0170 previously approved these changes Sep 9, 2021
View reviewed changes
@0xc0170
Copy link
Contributor

0xc0170 commented Sep 9, 2021

Ci started

@mergify mergify bot added needs: work and removed needs: CI labels Sep 9, 2021
@mbed-ci
Copy link

mbed-ci commented Sep 9, 2021

Jenkins CI Test : ❌ FAILED

Build Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs Status
jenkins-ci/mbed-os-ci_unittests ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-cloud-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-ARM ❌
jenkins-ci/mbed-os-ci_cmake-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-GCC_ARM ❌
jenkins-ci/mbed-os-ci_build-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-ARM ✔️

@jeromecoutant
Copy link
Collaborator Author

Jenkins CI Test : ❌ FAILED

I am checking baremetal build issue

@jeromecoutant
connectivity-netsocket-tests-tests-network-wifi update
787605c 
Use default NSAPI configuration
@jeromecoutant
connectivity-netsocket-tests-tests-network-wifi update2
bce33b0 
- add minor print to make debug easier
- remove not useful part
@mergify mergify bot dismissed 0xc0170’s stale review September 9, 2021 08:24

Pull request has been modified.

@jeromecoutant
Copy link
Collaborator Author

I am checking baremetal build issue

Corrected, let's restart CI

Thx

@0xc0170
Copy link
Contributor

0xc0170 commented Sep 9, 2021

It would be useful to do not force push during the review (I don't know now how the CI issue was resolved as the fix was amended ?).

@0xc0170
Copy link
Contributor

0xc0170 commented Sep 9, 2021

CI started

@jeromecoutant
Copy link
Collaborator Author

It would be useful to do not force push during the review (I don't know now how the CI issue was resolved as the fix was amended ?).

I added a MBED_CONF_NSAPI_PRESENT check:
https://github.com/ARMmbed/mbed-os/pull/15031/files#diff-f17a1cc02bf34ce57322e22f4fefe4a6fd54efa9096d12a5d70204239b79f59aR20

@mbed-ci
Copy link

mbed-ci commented Sep 9, 2021

Jenkins CI Test : ✔️ SUCCESS

Build Number: 2 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs Status
jenkins-ci/mbed-os-ci_unittests ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-cloud-example-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-example-ARM ✔️
jenkins-ci/mbed-os-ci_greentea-test ✔️

@0xc0170 0xc0170 merged commit 82036c8 into ARMmbed:master Sep 9, 2021
@mergify mergify bot removed the ready for merge label Sep 9, 2021
@jeromecoutant jeromecoutant deleted the PR_WIFI_TEST branch September 9, 2021 12:15
@mbedmain mbedmain added release-version: 6.15.0 Release-pending and removed release-type: patch Indentifies a PR as containing just a patch Release-pending labels Sep 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0xc0170 0xc0170 0xc0170 approved these changes

@pan- pan- pan- left review comments

Assignees
No one assigned
Labels
component: connectivity release-version: 6.15.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jeromecoutant @ciarmcom @0xc0170 @mbed-ci @pan- @mbedmain