Browse Source

added Validator for Shortcut section, added test for Shortcut section

twall 11 năm trước cách đây
mục cha
commit
8d44ea5145

+ 9 - 0
nsist/configreader.py

@@ -100,6 +100,15 @@ CONFIG_VALIDATORS = [
             ('bitness', False),
             ('bitness', False),
         ]
         ]
     ),
     ),
+    SectionValidator('Shortcut ... ',
+        [
+            ('entry_point', True),
+            ('script', False),
+            ('icon', False),
+            ('console', False),
+        ],
+        lambda s: s.startswith('Shortcut ')
+    ),
 ]
 ]
 
 
 class InvalidConfig(ValueError):
 class InvalidConfig(ValueError):

+ 4 - 0
nsist/tests/test_configuration_validator.py

@@ -9,6 +9,10 @@ def test_valid_config():
     configfile = os.path.join(DATA_FILES, 'valid_config.cfg')
     configfile = os.path.join(DATA_FILES, 'valid_config.cfg')
     configreader.read_and_validate(configfile)
     configreader.read_and_validate(configfile)
 
 
+def test_valid_config_with_shortcut():
+    configfile = os.path.join(DATA_FILES, 'valid_config_with_shortcut.cfg')
+    configreader.read_and_validate(configfile)
+
 @raises(configreader.InvalidConfig)
 @raises(configreader.InvalidConfig)
 def test_invalid_config_keys():
 def test_invalid_config_keys():
     configfile = os.path.join(DATA_FILES, 'invalid_config_keys.cfg')
     configfile = os.path.join(DATA_FILES, 'invalid_config_keys.cfg')