Fix name_resolve test broken on rebase
Fix name_resolve test broken on rebase

aleksandr-bakanov/astropy,StuartLittlefair/astropy,pllim/astropy,MSeifert04/astropy,funbaker/astropy,stargaser/astropy,astropy/astropy,stargaser/astropy,astropy/astropy,dhomeier/astropy,aleksandr-bakanov/astropy,larrybradley/astropy,funbaker/astropy,saimn/astropy,dhomeier/astropy,lpsinger/astropy,dhomeier/astropy,lpsinger/astropy,joergdietrich/astropy,pllim/astropy,bsipocz/astropy,tbabej/astropy,StuartLittlefair/astropy,joergdietrich/astropy,lpsinger/astropy,StuartLittlefair/astropy,stargaser/astropy,astropy/astropy,dhomeier/astropy,aleksandr-bakanov/astropy,kelle/astropy,AustereCuriosity/astropy,saimn/astropy,mhvk/astropy,bsipocz/astropy,kelle/astropy,pllim/astropy,MSeifert04/astropy,tbabej/astropy,tbabej/astropy,astropy/astropy,MSeifert04/astropy,pllim/astropy,saimn/astropy,DougBurke/astropy,astropy/astropy,joergdietrich/astropy,AustereCuriosity/astropy,lpsinger/astropy,MSeifert04/astropy,joergdietrich/astropy,mhvk/astropy,DougBurke/astropy,larrybradley/astropy,AustereCuriosity/astropy,kelle/astropy,bsipocz/astropy,joergdietrich/astropy,tbabej/astropy,larrybradley/astropy,funbaker/astropy,AustereCuriosity/astropy,mhvk/astropy,DougBurke/astropy,stargaser/astropy,bsipocz/astropy,larrybradley/astropy,kelle/astropy,larrybradley/astropy,kelle/astropy,StuartLittlefair/astropy,lpsinger/astropy,mhvk/astropy,saimn/astropy,aleksandr-bakanov/astropy,AustereCuriosity/astropy,StuartLittlefair/astropy,dhomeier/astropy,mhvk/astropy,funbaker/astropy,DougBurke/astropy,pllim/astropy,tbabej/astropy,saimn/astropy