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

container.execute: fix when exec_start completes fast #60

Merged
merged 1 commit into from
Mar 23, 2024

Conversation

jmtd
Copy link
Collaborator

@jmtd jmtd commented Mar 21, 2024

p.join will return None in two situations: when the timeout is reached, and if the process has completed already.

Adjust the check so that we throw an exception in the former case but not the latter.


This hopefully fixes a reported error in running the test suite for https://github.com/wildfly/wildfly-s2i/actions/runs/8345796441/job/22876447353#step:16:2666


For this wishing to test this: at the moment https://github.com/jmtd/behave-test-steps branch v1 has this patch.

p.join will return None in two situations: when the timeout is reached,
and if the process has completed already.

Adjust the check so that we throw an exception in the former case but
not the latter.

Signed-off-by: Jonathan Dowland <[email protected]>
@jmtd
Copy link
Collaborator Author

jmtd commented Mar 21, 2024

Confirmation that this fixed wildfly: wildfly/wildfly-s2i#464

jmtd added a commit to jmtd/behave-test-steps that referenced this pull request Mar 21, 2024
See also PR cekit#60.

Signed-off-by: Jonathan Dowland <[email protected]>
@rnc
Copy link
Contributor

rnc commented Mar 22, 2024

@jmtd If this confirms the issue, are you merging it ?

@jmtd
Copy link
Collaborator Author

jmtd commented Mar 22, 2024

@rnc I seem to lack permission to merge it myself. I was hoping to learn whether this also addressed cekit/cekit#903 , but I think fixing wildfly's test runs is probably sufficient to merge it.

@rnc
Copy link
Contributor

rnc commented Mar 23, 2024

@jmtd I've modified your permissions.

@rnc rnc merged commit 0a2fb44 into cekit:v1 Mar 23, 2024
1 check passed
rnc pushed a commit that referenced this pull request Mar 23, 2024
* In-source behave tests from OpenJDK for regression suite

The GHA job up until now relied upon running the externally-defined
behave tests for the OpenJDK container images (runtime variant).

The external test suite is primarily designed to cover the OpenJDK
image, and not to provide coverage of all of the behave-test-steps.

Rework the job to operate on a local copy of these behave tests.
(Also do a bit of spring-cleaning)

Future work can adjust the feature files to provide better coverage
for the steps defined in this repository.

Signed-off-by: Jonathan Dowland <[email protected]>

* Test to exercise 'File . should contain'

See also PR #60.

Signed-off-by: Jonathan Dowland <[email protected]>

---------

Signed-off-by: Jonathan Dowland <[email protected]>
@jmtd jmtd deleted the fix-container-execute-timeout branch March 25, 2024 09:28
jmtd added a commit to jmtd/behave-test-steps that referenced this pull request Nov 21, 2024
p.join will return None in two situations: when the timeout is reached,
and if the process has completed already.

Adjust the check so that we throw an exception in the former case but
not the latter.

Signed-off-by: Jonathan Dowland <[email protected]>
jmtd added a commit to jmtd/behave-test-steps that referenced this pull request Nov 21, 2024
* In-source behave tests from OpenJDK for regression suite

The GHA job up until now relied upon running the externally-defined
behave tests for the OpenJDK container images (runtime variant).

The external test suite is primarily designed to cover the OpenJDK
image, and not to provide coverage of all of the behave-test-steps.

Rework the job to operate on a local copy of these behave tests.
(Also do a bit of spring-cleaning)

Future work can adjust the feature files to provide better coverage
for the steps defined in this repository.

Signed-off-by: Jonathan Dowland <[email protected]>

* Test to exercise 'File . should contain'

See also PR cekit#60.

Signed-off-by: Jonathan Dowland <[email protected]>

---------

Signed-off-by: Jonathan Dowland <[email protected]>
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.

2 participants