valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hasattr cannot find parent properties starting with __

Browse Source
This commit is contained in:
Tyler Johnson 2019-08-14 15:28:23 -06:00
parent 686cab945e
commit 7d603bec54
No known key found for this signature in database
GPG Key ID: 691E31397E27D004
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/integration/cloud/clouds/test_ec2.py
View File

@ -55,9 +55,9 @@ class EC2Test(CloudTest):
'''
Make sure the testing environment has a Windows installer executable.
'''
if not hasattr(self, '__installer'):
self.__installer = self.__fetch_installer()
return self.__installer
if not hasattr(self, '_installer'):
self._installer = self.__fetch_installer()
return self._installer
@expensiveTest
def setUp(self):

24
tests/integration/cloud/helpers/cloud_test_base.py
View File

@ -78,23 +78,23 @@ class CloudTest(ShellCase):
@property
def instance_name(self):
if not hasattr(self, '__instance_name'):
if not hasattr(self, '_instance_name'):
# Create the cloud instance name to be used throughout the tests
subclass = self.__class__.__name__.strip('Test')
# Use the first three letters of the subclass, fill with '-' if too short
self.__instance_name = generate_random_name('cloud-test-{:-<3}-'.format(subclass[:3])).lower()
return self.__instance_name
self._instance_name = generate_random_name('cloud-test-{:-<3}-'.format(subclass[:3])).lower()
return self._instance_name
@property
def providers(self):
if not hasattr(self, '__providers'):
self.__providers = self.run_cloud('--list-providers')
return self.__providers
if not hasattr(self, '_providers'):
self._providers = self.run_cloud('--list-providers')
return self._providers
@property
def provider_config(self):
if not hasattr(self, '__provider_config'):
self.__provider_config = cloud_providers_config(
if not hasattr(self, '_provider_config'):
self._provider_config = cloud_providers_config(
path.join(
FILES,
'conf',
@ -102,12 +102,12 @@ class CloudTest(ShellCase):
self.PROVIDER + '.conf'
)
)
return self.__provider_config[self.profile_str][self.PROVIDER]
return self._provider_config[self.profile_str][self.PROVIDER]
@property
def config(self):
if not hasattr(self, '__config'):
self.__config = cloud_config(
if not hasattr(self, '_config'):
self._config = cloud_config(
path.join(
FILES,
'conf',
@ -115,7 +115,7 @@ class CloudTest(ShellCase):
self.PROVIDER + '.conf'
)
)
return self.__config
return self._config
@property
def profile_str(self):