qa/1720: fix trap snarfoo
qa/1720: fix trap snarfoo

_really_ want to run _cleanup(), that's where the new diag capture
lives.

adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp