test: Clean up unpack_base.
test: Clean up unpack_base.

We don't support magic base tarballs anymore, we don't need to remove
the created files twice, and calling modify_func can be factored out
of the branches.

Reviewed-by: Dominik Perpeet <f7830b2723a5db4fc185058b06cfab4b89a38da9@redhat.com>

vanloswang/cockpit,denysvitali/cockpit,haiyangd/cockpit_view,cockpituous/cockpit,mareklibra/cockpit,deryni/cockpit,Scribery/cockpit,xhad/cockpit,SotolitoLabs/cockpit,michalskrivanek/cockpit,sgallagher/cockpit,netzvieh/cockpit,denysvitali/cockpit,jscotka/cockpit,Scribery/cockpit,deryni/cockpit,andreasn/cockpit,maxamillion/cockpit,jscotka/cockpit,Armstrong1992/cockpit,cockpituous/cockpit,arilivigni/cockpit,petervo/cockpit,moraleslazaro/cockpit,sgallagher/cockpit,matobet/cockpit,moraleslazaro/cockpit,xhad/cockpit,cockpituous/cockpit,xhad/cockpit,dperpeet/cockpit,moolitayer/cockpit,Thermionix/cockpit,evol262/cockpit,firebitsbr/cockpit,garrett/cockpit,larskarlitski/cockpit,martinpitt/cockpit,michalskrivanek/cockpit,netzvieh/cockpit,haiyangd/cockpit_view,martinpitt/cockpit,deryni/cockpit,larsu/cockpit,xhad/cockpit,larsu/cockpit,michalskrivanek/cockpit,matobet/cockpit,mvollmer/cockpit,Scribery/cockpit,petervo/cockpit,matobet/cockpit,netzvieh/cockpit,cockpit-project/cockpit,martinpitt/cockpit,petervo/cockpit,andreasn/cockpit,haiyangd/cockpit_view,martinpitt/cockpit,darioajr/cockpit,FireDrunk/cockpit,arilivigni/cockpit,larsu/cockpit,michalskrivanek/cockpit,mareklibra/cockpit,zigitax/cockpit,Armstrong1992/cockpit,harishanand95/cockpit,harishanand95/cockpit,michalskrivanek/cockpit,cockpit-project/cockpit,andreasn/cockpit,harishanand95/cockpit,mvollmer/cockpit,zigitax/cockpit,harishanand95/cockpit,michalskrivanek/cockpit,mvollmer/cockpit,mvollmer/cockpit,matobet/cockpit,denysvitali/cockpit,zigitax/cockpit,andreasn/cockpit,maxamillion/cockpit,larskarlitski/cockpit,martinpitt/cockpit,moraleslazaro/cockpit,arilivigni/cockpit,harishanand95/cockpit,arilivigni/cockpit,stefwalter/cockpit,firebitsbr/cockpit,moolitayer/cockpit,sgallagher/cockpit,Scribery/cockpit,sgallagher/cockpit,firebitsbr/cockpit,mvollmer/cockpit,mareklibra/cockpit,andreasn/cockpit,larsu/cockpit,FireDrunk/cockpit,moolitayer/cockpit,vanloswang/cockpit,moolitayer/cockpit,vanloswang/cockpit,matobet/cockpit,SotolitoLabs/cockpit,matobet/cockpit,firebitsbr/cockpit,dperpeet/cockpit,moraleslazaro/cockpit,jscotka/cockpit,garrett/cockpit,deryni/cockpit,stefwalter/cockpit,maxamillion/cockpit,SotolitoLabs/cockpit,darioajr/cockpit,maxamillion/cockpit,SotolitoLabs/cockpit,vanloswang/cockpit,mareklibra/cockpit,evol262/cockpit,darioajr/cockpit,maxamillion/cockpit,garrett/cockpit,Armstrong1992/cockpit,arilivigni/cockpit,dperpeet/cockpit,Scribery/cockpit,garrett/cockpit,larsu/cockpit,evol262/cockpit,darioajr/cockpit,harishanand95/cockpit,moraleslazaro/cockpit,denysvitali/cockpit,sgallagher/cockpit,firebitsbr/cockpit,larskarlitski/cockpit,FireDrunk/cockpit,zigitax/cockpit,larskarlitski/cockpit,FireDrunk/cockpit,deryni/cockpit,mareklibra/cockpit,nmav/cockpit,cockpituous/cockpit,darioajr/cockpit,zigitax/cockpit,Scribery/cockpit,netzvieh/cockpit,nmav/cockpit,nmav/cockpit,Thermionix/cockpit,Thermionix/cockpit,stefwalter/cockpit,denysvitali/cockpit,arilivigni/cockpit,haiyangd/cockpit_view,Thermionix/cockpit,jscotka/cockpit,petervo/cockpit,garrett/cockpit,dperpeet/cockpit,Thermionix/cockpit,harishanand95/cockpit,larsu/cockpit,xhad/cockpit,dperpeet/cockpit,mareklibra/cockpit,moolitayer/cockpit,evol262/cockpit,dperpeet/cockpit,andreasn/cockpit,SotolitoLabs/cockpit,moraleslazaro/cockpit,Scribery/cockpit,evol262/cockpit,stefwalter/cockpit,Armstrong1992/cockpit,vanloswang/cockpit,stefwalter/cockpit,deryni/cockpit,Armstrong1992/cockpit,petervo/cockpit,SotolitoLabs/cockpit,larskarlitski/cockpit,jscotka/cockpit,stefwalter/cockpit,SotolitoLabs/cockpit,cockpituous/cockpit,sgallagher/cockpit,netzvieh/cockpit,xhad/cockpit,cockpit-project/cockpit,evol262/cockpit,cockpit-project/cockpit,moraleslazaro/cockpit,larskarlitski/cockpit,netzvieh/cockpit,nmav/cockpit,haiyangd/cockpit_view,mareklibra/cockpit,dperpeet/cockpit,sgallagher/cockpit,michalskrivanek/cockpit,stefwalter/cockpit,vanloswang/cockpit,xhad/cockpit,andreasn/cockpit,Thermionix/cockpit,cockpituous/cockpit,jscotka/cockpit,larskarlitski/cockpit,vanloswang/cockpit,cockpit-project/cockpit,petervo/cockpit,nmav/cockpit,FireDrunk/cockpit,deryni/cockpit,petervo/cockpit,arilivigni/cockpit