[LU-11010] Remove call to ‘return’ after call to ‘skip’ in Lustre test suites

• Type: Improvement
• Resolution: Fixed
• Priority: Minor
• Fix Version/s: Lustre 2.13.0, Lustre 2.10.7, Lustre 2.12.1
• Labels: test_script_improvements tests
• Assignee: James Nunez (Inactive)
• Reporter: James Nunez (Inactive)

Description

With the patch for LU-10461, https://review.whamcloud.com/30964, a call to exit was included in skip() and a skip_noexit() routine was created.

5776 skip_noexit() {
5777         echo
5778         log " SKIP: $TESTSUITE $TESTNAME $@"
5779 
5780         if [[ -n "$ALWAYS_SKIPPED" ]]; then
5781                 skip_logged $TESTNAME "$@"
5782         else
5783                 mkdir -p $LOGDIR
5784                 echo "$@" > $LOGDIR/skip
5785         fi
5786 
5787         [[ -n "$TESTSUITELOG" ]] &&
5788                 echo "$TESTSUITE: SKIP: $TESTNAME $@" >> $TESTSUITELOG || true
5789 }
5790 
5791 skip() {
5792         skip_noexit
5793         exit 0
5794 }

Tests that have calls to skip() or skip_env() should be reviewed to see if they should be converted to skip_noexit() or remove the call to return that follows the call to skip.

Issue Links

• is related to: LU-10461 sanity 77c failure due to variables called in cleanup routine are out of scope

Comments

[Gerrit Updater]

Oleg Drokin ([e-mail]) merged in patch https://review.whamcloud.com/34565/
Subject: LU-11010 tests: remove return after skip for conf-sanity
Project: fs/lustre-release
Branch: b2_12
Current Patch Set:
Commit: cd8a8949ba6d618394ec4ac3db60e41b8943ed8f

[Gerrit Updater]

Minh Diep ([e-mail]) uploaded a new patch: https://review.whamcloud.com/34565
Subject: LU-11010 tests: remove return after skip for conf-sanity
Project: fs/lustre-release
Branch: b2_12
Current Patch Set: 1
Commit: c6a6c3f98646b4a20880453b5e3376dc2682eff5

[Peter Jones]

Landed for 2.13

[Gerrit Updater]

Oleg Drokin ([e-mail]) merged in patch https://review.whamcloud.com/32735/
Subject: LU-11010 tests: remove return after skip for conf-sanity
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: 915b16cf1278026a9f914f268e8cdfb578d929c4

[Gerrit Updater]

Oleg Drokin ([e-mail]) merged in patch https://review.whamcloud.com/34199/
Subject: LU-11010 tests: remove calls to return after skip()
Project: fs/lustre-release
Branch: b2_10
Current Patch Set:
Commit: f8bb7b1a04543de759b863ee06cfccb83d908856

[Gerrit Updater]

James Nunez ([e-mail]) uploaded a new patch: https://review.whamcloud.com/34199
Subject: LU-11010 tests: remove calls to return after skip()
Project: fs/lustre-release
Branch: b2_10
Current Patch Set: 1
Commit: 37a672a7f209ab5c9a8e7dfc051ac4ea9a254355

[Gerrit Updater]

Oleg Drokin ([e-mail]) merged in patch https://review.whamcloud.com/32733/
Subject: LU-11010 tests: remove calls to return after skip()
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: e2226ae35978f223bf851dabf15eb6b606da8020

[James Nunez (Inactive)]

Two more patches need a little work and need to land to finish up this work;
https://review.whamcloud.com/#/c/32735/
https://review.whamcloud.com/#/c/32733/

[Peter Jones]

jamesanunez so is that the lot now?

[Gerrit Updater]

Oleg Drokin ([e-mail]) merged in patch https://review.whamcloud.com/32732/
Subject: LU-11010 tests: remove calls to return after skip()
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: a72a949be47fc317de5d1cbcde7d79a5dad91e64