Merge pull request #201 from Akasurde/kube_config_no_obj_fix

FileOrData: Handle None object
This commit is contained in:
Kubernetes Prow Robot 2020-07-29 09:39:47 -07:00 committed by GitHub
commit ab61ca3c27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions

View File

@ -97,6 +97,8 @@ class FileOrData(object):
self._file = None
self._data = None
self._base64_file_content = base64_file_content
if not obj:
return
if data_key_name in obj:
self._data = obj[data_key_name]
elif file_key_name in obj:

View File

@ -255,6 +255,16 @@ class TestFileOrData(BaseTestCase):
data_key_name=TEST_DATA_KEY, base64_file_content=False)
self.assertEqual(TEST_DATA, self.get_file_content(t.as_file()))
def test_file_given_no_object(self):
t = FileOrData(obj=None, file_key_name=TEST_FILE_KEY,
data_key_name=TEST_DATA_KEY)
self.assertEqual(t.as_file(), None)
def test_file_given_no_object_data(self):
t = FileOrData(obj=None, file_key_name=TEST_FILE_KEY,
data_key_name=TEST_DATA_KEY)
self.assertEqual(t.as_data(), None)
class TestConfigNode(BaseTestCase):