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

LibCI - Recycle device on retry #12911

Merged
merged 4 commits into from
May 13, 2024
Merged

LibCI - Recycle device on retry #12911

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c750ce
reset device on retries
Nir-Az Mar 20, 2024
f216af9
some changes
Nir-Az May 9, 2024
a482695
move log to inner function
Nir-Az May 12, 2024
724a805
updates
maloel May 13, 2024
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
1 change: 0 additions & 1 deletion unit-tests/py/rspy/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,6 @@ def finish( on_fail=LOG ):
log.i("Test passed")
test_in_progress = None


def print_separator():
"""
For use only in-between test-cases, this will separate them in some visual way so as
Expand Down
9 changes: 8 additions & 1 deletion unit-tests/run-unit-tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,8 @@ def test_wrapper_( test, configuration=None, repetition=1, retry=0, sns=None ):
if rslog:
opts.add( '--rslog' )
try:
if repetition > 0:
log.d("repeat #", repetition + 1)
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think this is a retry, not a repetition? Oh wait... I think you want to check both retry and repetition here... but I think configuration_str() already does all this for you, why not use it?

Replace line 414 with:

if not log.is_debug_on() or repetition or retry:

test.run_test( configuration = configuration, log_path = log_path, opts = opts )
except FileNotFoundError as e:
log.e( log.red + test.name + log.reset + ':', str( e ) + configuration_str( configuration, repetition, prefix=' ' ) )
Expand All @@ -444,7 +446,12 @@ def test_wrapper( test, configuration=None, repetition=1, sns=None ):
if test_wrapper_( test, configuration, repetition, retry, sns ):
return True
log._n_errors -= 1
time.sleep( 1 ) # small pause between tries
if no_reset:
time.sleep(1) # small pause between tries
Copy link
Collaborator

Choose a reason for hiding this comment

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

This should happen only if retry < test.config.retries.
Anyway, same comment as before: move to before line 446 and check if retry > 0. And the log (line 452) should now be taken care of by test_wrapper_(), right?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

There is a difference between retry and repeat, repeat is currently handles inside, retry outside.
I will think about it.

elif retry < test.config.retries:
log.w("retry", retry + 1, "out of", test.config.retries)
devices.enable_only(serial_numbers, recycle=True)

log._n_errors += 1
return False

Expand Down
Loading