Reverted foo/bar creds per #46265

This commit is contained in:
Tyler Johnson 2019-08-15 19:11:48 -06:00
parent 3f56baddd7
commit f90fe66ec3
3 changed files with 14 additions and 3 deletions

View file

@ -28,6 +28,17 @@ class ProfitBricksTest(CloudTest):
PROVIDER = 'profitbricks'
REQUIRED_PROVIDER_CONFIG_ITEMS = ('username', 'password', 'datacenter_id')
def setUp(self):
super(ProfitBricksTest, self).setUp()
username = self.provider_config.get('username')
password = self.provider_config.get('password')
# A default username and password must be hard-coded as defaults as per issue #46265
# If they are 'foo' and 'bar' it is the same as not being set
self.skipTest('Conf items are missing that must be provided to run these tests: username, password'
'\nCheck tests/integration/files/conf/cloud.providers.d/{0}.conf'.format(self.PROVIDER))
def test_list_images(self):
'''
Tests the return of running the --list-images command for ProfitBricks

View file

@ -1,6 +1,6 @@
profitbricks-config:
username: ''
password: ''
username: 'foo'
password: 'bar'
datacenter_id: 74d65326-d9b7-41c3-9f51-73ffe0fcd16d
driver: profitbricks
ssh_public_key: ~/.ssh/id_rsa.pub

View file

@ -239,7 +239,7 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixin):
'''
Execute salt-cloud
'''
arg_str = '-c {0} {1}'.format(self.config_dir, arg_str)
arg_str = '-c {0} {1} -ldebug '.format(self.config_dir, arg_str)
return self.run_script('salt-cloud', arg_str, catch_stderr, timeout)
def run_script(self,