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

Add timeout for remoted socket to be ready in test_request_agent_info.py #1624

Merged
merged 1 commit into from
Jul 26, 2021

Conversation

mdengra
Copy link
Contributor

@mdengra mdengra commented Jul 21, 2021

Related issue
Closes: #1579

Description

This PR modifies the test_request_agent_info.py of remoted tests to add a timeout for remoted socket to be ready. This timeout is only added in a specific use case, which is where the errors occur.

The number of use cases has also been reduced from nine to three, as those eliminated were redundant.

Finally, the documentation has been updated to include the above changes.

Configuration options

All the tests are run with the default configuration and the following options in local_internal_options.conf

remoted.debug=2
wazuh_database.interval=1
wazuh_db.commit_time=2
wazuh_db.commit_time_max=3
monitord.rotate_log=0

Tests

The comments will have the description for every test run

  • Proven that tests pass when they have to pass.

refac: Delete six redundant use cases

Closes: #1579
@mdengra mdengra self-assigned this Jul 21, 2021
@mdengra
Copy link
Contributor Author

mdengra commented Jul 21, 2021

Test Execution - Results

Description

Test results with the default configuration modules in the ossec.conf:

Test Executions Date By Status
test_request_agent_info_local_r1.log 2021-07-21 Miguel 🟡
test_request_agent_info_local_r2.log 2021-07-21 Miguel 🟡
test_request_agent_info_local_r3.log 2021-07-21 Miguel 🟡

{'PROTOCOL': 'udp,tcp'},
{'PROTOCOL': 'tcp'},
{'PROTOCOL': 'udp'},
{'PROTOCOL': 'udp,tcp'}
Copy link
Contributor

Choose a reason for hiding this comment

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

I think that we should keep all the possible combinations of protocols that we have now since Wazuh 4.2. Before this version, the manager only accepted connections using only one protocol, but now it accepts both, TCP and UDP simultaneously.
This is just a suggestion so we can discuss this in our daily meeting to make a general decision for all the tests that have single protocols and a combination of them.

@damarisg
Copy link
Member

damarisg commented Jul 22, 2021

Test Execution - Results

Test Executions Date By Status
RemotedRequestAgentInfo.log 2021-07-22 Seyla 🟡
RemotedRequestAgentInfo2.log 2021-07-22 Seyla 🟡
RemotedRequestAgentInfo3.log 2021-07-22 Seyla 🔴
RemotedRequestAgentInfo4.log 2021-07-22 Seyla 🟡

Could @mdengra execute this again, please? I would like to see if you have the same error. In case that you can't reproduce the fail, tell me and I will put my approval.

@mdengra
Copy link
Contributor Author

mdengra commented Jul 22, 2021

2021-07-22

Test Execution - Results

Test results with the default configuration modules in the ossec.conf:

Test Executions Date By Status
test_request_agent_info_local_r1.log 2021-07-22 Miguel 🟡
test_request_agent_info_local_r2.log 2021-07-22 Miguel 🟡
test_request_agent_info_local_r3.log 2021-07-22 Miguel 🟡
test_request_agent_info_local_r4.log 2021-07-22 Miguel 🟡

Hello @damarisg, I have rerun the tests but I have not been able to reproduce the error in my test environment.

@DProvinciani
Copy link
Contributor

Test Execution - Results

Test results with the default configuration modules in the ossec.conf:

Test Executions Date By Status
test_request_agent_info-r1.log 2021-07-22 Diego 🟡
test_request_agent_info-r2.log 2021-07-22 Diego 🟡
test_request_agent_info-r3.log 2021-07-22 Diego 🟡

@DProvinciani DProvinciani changed the base branch from 1516-4.2.0-full-green to 1530-full-yellow-remoted July 22, 2021 15:27
@damarisg damarisg merged commit a461e4b into 1530-full-yellow-remoted Jul 26, 2021
@damarisg damarisg deleted the 1579-test-request-agent-info branch July 26, 2021 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants