Merge pull request #38163 from Ch3LL/enabled_ec2_cloud

enabled ec2 cloud tests
This commit is contained in:
Mike Place 2016-12-09 11:01:57 -07:00 committed by GitHub
commit 65b2ad7b14

View file

@ -14,7 +14,6 @@ import integration
from salt.config import cloud_providers_config
# Import Salt Testing Libs
from salttesting import skipIf
from salttesting.helpers import ensure_in_syspath, expensiveTest
ensure_in_syspath('../../../')
@ -37,7 +36,6 @@ INSTANCE_NAME = __random_name()
PROVIDER_NAME = 'ec2'
@skipIf(True, 'Skipping until we can figure out why the testrunner bails.')
class EC2Test(integration.ShellCase):
'''
Integration tests for the EC2 cloud provider in Salt-Cloud