[LU-11010] Remove call to ‘return’ after call to ‘skip’ in Lustre test suites Created: 09/May/18  Updated: 08/Apr/19  Resolved: 03/Mar/19

Status: Resolved
Project: Lustre
Component/s: None
Affects Version/s: None
Fix Version/s: Lustre 2.13.0, Lustre 2.10.7, Lustre 2.12.1

Type: Improvement Priority: Minor
Reporter: James Nunez (Inactive) Assignee: James Nunez (Inactive)
Resolution: Fixed Votes: 0
Labels: test_script_improvements, tests

Issue Links:
Related
is related to LU-10461 sanity 77c failure due to variables c... Resolved
Rank (Obsolete): 9223372036854775807

 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.



 Comments   
Comment by Gerrit Updater [ 09/May/18 ]

James Nunez (james.a.nunez@intel.com) uploaded a new patch: https://review.whamcloud.com/32346
Subject: LU-11010 tests: remove calls to return after skip()
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: 85e9357214cab57c411bca9d75deb200a75ccb3d

Comment by Gerrit Updater [ 29/May/18 ]

Oleg Drokin (oleg.drokin@intel.com) merged in patch https://review.whamcloud.com/32346/
Subject: LU-11010 tests: remove calls to return after skip()
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: ea76de56fccfdc6f8bd0087adc36c19257e414d3

Comment by Peter Jones [ 29/May/18 ]

Landed for 2.12

 

Comment by James Nunez (Inactive) [ 26/Jun/18 ]

There are many test suites that still call return() after skip(). All of these call need to be reviewed and determined if we can just remove the return call or need to call skip_noexit() or some other action.

Comment by Gerrit Updater [ 30/Jul/18 ]

Oleg Drokin (green@whamcloud.com) merged in patch https://review.whamcloud.com/32731/
Subject: LU-11010 tests: remove calls to return after skip()
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: bf19f7a4fa6970f57bfe922461cfae7a3e80f89c

Comment by Gerrit Updater [ 16/Sep/18 ]

Oleg Drokin (green@whamcloud.com) 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

Comment by Peter Jones [ 16/Sep/18 ]

jamesanunez so is that the lot now?

Comment by James Nunez (Inactive) [ 02/Oct/18 ]

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/

Comment by Gerrit Updater [ 23/Oct/18 ]

Oleg Drokin (green@whamcloud.com) 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

Comment by Gerrit Updater [ 06/Feb/19 ]

James Nunez (jnunez@whamcloud.com) 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

Comment by Gerrit Updater [ 15/Feb/19 ]

Oleg Drokin (green@whamcloud.com) 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

Comment by Gerrit Updater [ 03/Mar/19 ]

Oleg Drokin (green@whamcloud.com) 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

Comment by Peter Jones [ 03/Mar/19 ]

Landed for 2.13

Comment by Gerrit Updater [ 01/Apr/19 ]

Minh Diep (mdiep@whamcloud.com) 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

Comment by Gerrit Updater [ 08/Apr/19 ]

Oleg Drokin (green@whamcloud.com) 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

Generated at Sat Feb 10 02:40:09 UTC 2024 using Jira 9.4.14#940014-sha1:734e6822bbf0d45eff9af51f82432957f73aa32c.