fix instance freshness problem in test_incomplete_count

nihlaeth · Feb 25, 2017 · 472b701 · 472b701
1 parent 290eb9b
commit 472b701
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/tests/test_config_elements.py b/tests/test_config_elements.py
@@ -286,26 +286,25 @@ class MySection(Section):
         assert optional_section.incomplete_count == 1
 
         # missing required value, optional value provided
-        optional_section = MySection(required=False)
-        optional_section.element_name = "section"
         arguments = vars(parser.parse_args(['--two', '42']))
         optional_section.extract_data_from_parser(arguments)
         optional_section.validate_data()
         assert optional_section.incomplete_count == 1
 
         # required value provided
-        optional_section = MySection(required=False)
-        optional_section.element_name = "section"
         arguments = vars(parser.parse_args(['--one', '5']))
         optional_section.extract_data_from_parser(arguments)
         optional_section.validate_data()
         assert optional_section.incomplete_count == 0
 
         # test required section
+        # refresh element instances, since their values are shared across
+        # section instances
+        class MySection(Section):
+            one = IntegerOption()
+            two = IntegerOption(required=False)
         required_section = MySection(required=True)
         required_section.element_name = "section"
-        parser = argparse.ArgumentParser(prog="test application")
-        required_section.construct_parser(parser)
 
         # missing required value
         arguments = vars(parser.parse_args([]))
@@ -315,17 +314,13 @@ class MySection(Section):
         assert required_section.incomplete_count == 0
 
         # missing required value, optional value provided
-        required_section = MySection(required=True)
-        required_section.element_name = "section"
         arguments = vars(parser.parse_args(['--two', '42']))
         required_section.extract_data_from_parser(arguments)
         with pytest.raises(MissingData):
             required_section.validate_data()
         assert required_section.incomplete_count == 0
 
         # required value provided
-        required_section = MySection(required=True)
-        required_section.element_name = "section"
         arguments = vars(parser.parse_args(['--one', '5']))
         required_section.extract_data_from_parser(arguments)
         required_section.validate_data()

diff --git a/user_config/__init__.py b/user_config/__init__.py
@@ -705,6 +705,7 @@ def validate_data(self):
             try:
                 self._elements[element].validate_data()
             except MissingData:
+                print(self.required)
                 if not self.required:
                     self.incomplete_count += 1
                 else: