saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #40194 from terminalmage/fix-docker-test-imports

Browse source 
Change imports for dockerng tests
This commit is contained in:
Nicole Thomas 2017-03-21 13:34:54 -06:00 • committed by GitHub
commit 82cee58e72
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/unit/modules/dockerng_test.py
View file

@ -22,7 +22,7 @@ from salt.ext.six.moves import range
ensure_in_syspath('../../')
# Import Salt Libs
from salt.modules import dockerng as dockerng_mod
import salt.modules.dockerng as dockerng_mod
from salt.exceptions import CommandExecutionError, SaltInvocationError
dockerng_mod.__context__ = {'docker.docker_version': ''}

4
tests/unit/states/dockerng_test.py
View file

@ -22,8 +22,8 @@ ensure_in_syspath('../../')
# Import Salt Libs
from salt.exceptions import CommandExecutionError
from salt.modules import dockerng as dockerng_mod
from salt.states import dockerng as dockerng_state
import salt.modules.dockerng as dockerng_mod
import salt.states.dockerng as dockerng_state
dockerng_mod.__context__ = {'docker.docker_version': ''}
dockerng_mod.__salt__ = {}