shell: Fix tests for previous changes, and remove a race with NM
shell: Fix tests for previous changes, and remove a race with NM

Closes #977
Reviewed-by: Stef Walter <8a7fbf0f15d3ad982af54ef28f5c117d2494b76c@redhat.com>

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