Add tests for .from_yaml() for config and config option

Author: rmk135

src/dependency_injector/providers.c

@@ -1595,7 +1595,7 @@ cdef class ConfigurationOption(Provider):
 
  config_content = _resolve_config_env_markers(
  config_content,
- envs_required=envs_required,
+ envs_required=envs_required or self._is_strict_mode_enabled(),
  )
  config = yaml.load(config_content, loader)
 
@@ -2025,7 +2025,7 @@ cdef class Configuration(Object):
 
  config_content = _resolve_config_env_markers(
  config_content,
- envs_required=envs_required,
+ envs_required=envs_required or self._is_strict_mode_enabled(),
  )
  config = yaml.load(config_content, loader)
 

src/dependency_injector/providers.pyx

@@ -905,7 +905,7 @@ def test_env_variable_interpolation(self):
  self.assertEqual(self.config.section1.value2(), 'test-path/path')
 
  @unittest.skipIf(sys.version_info[:2] == (3, 4), 'PyYAML does not support Python 3.4')
- def test_missing_envs(self):
+ def test_missing_envs_not_required(self):
  del os.environ['CONFIG_TEST_ENV']
  del os.environ['CONFIG_TEST_PATH']
 
@@ -930,6 +930,39 @@ def test_missing_envs(self):
  self.assertIsNone(self.config.section1.value1())
  self.assertEqual(self.config.section1.value2(), '/path')
 
+ @unittest.skipIf(sys.version_info[:2] == (3, 4), 'PyYAML does not support Python 3.4')
+ def test_missing_envs_required(self):
+ with open(self.config_file, 'w') as config_file:
+ config_file.write(
+ 'section:\n'
+ ' undefined: ${UNDEFINED}\n'
+ )
+
+ with self.assertRaises(ValueError) as context:
+ self.config.from_yaml(self.config_file, envs_required=True)
+
+ self.assertEqual(
+ str(context.exception),
+ 'Missing required environment variable "UNDEFINED"',
+ )
+
+ @unittest.skipIf(sys.version_info[:2] == (3, 4), 'PyYAML does not support Python 3.4')
+ def test_missing_envs_strict_mode(self):
+ with open(self.config_file, 'w') as config_file:
+ config_file.write(
+ 'section:\n'
+ ' undefined: ${UNDEFINED}\n'
+ )
+
+ self.config.set_strict(True)
+ with self.assertRaises(ValueError) as context:
+ self.config.from_yaml(self.config_file)
+
+ self.assertEqual(
+ str(context.exception),
+ 'Missing required environment variable "UNDEFINED"',
+ )
+
  @unittest.skipIf(sys.version_info[:2] == (3, 4), 'PyYAML does not support Python 3.4')
  def test_option_missing_envs(self):
  del os.environ['CONFIG_TEST_ENV']
@@ -956,6 +989,39 @@ def test_option_missing_envs(self):
  self.assertIsNone(self.config.option.section1.value1())
  self.assertEqual(self.config.option.section1.value2(), '/path')
 
+ @unittest.skipIf(sys.version_info[:2] == (3, 4), 'PyYAML does not support Python 3.4')
+ def test_option_missing_envs_required(self):
+ with open(self.config_file, 'w') as config_file:
+ config_file.write(
+ 'section:\n'
+ ' undefined: ${UNDEFINED}\n'
+ )
+
+ with self.assertRaises(ValueError) as context:
+ self.config.option.from_yaml(self.config_file, envs_required=True)
+
+ self.assertEqual(
+ str(context.exception),
+ 'Missing required environment variable "UNDEFINED"',
+ )
+
+ @unittest.skipIf(sys.version_info[:2] == (3, 4), 'PyYAML does not support Python 3.4')
+ def test_option_missing_envs_strict_mode(self):
+ with open(self.config_file, 'w') as config_file:
+ config_file.write(
+ 'section:\n'
+ ' undefined: ${UNDEFINED}\n'
+ )
+
+ self.config.set_strict(True)
+ with self.assertRaises(ValueError) as context:
+ self.config.option.from_yaml(self.config_file)
+
+ self.assertEqual(
+ str(context.exception),
+ 'Missing required environment variable "UNDEFINED"',
+ )
+
  @unittest.skipIf(sys.version_info[:2] == (3, 4), 'PyYAML does not support Python 3.4')
  def test_default_values(self):
  os.environ['DEFINED'] = 'defined'