mirror of
https://github.com/samba-team/samba.git
synced 2025-07-15 16:59:09 +03:00
python: Add function to look for unsubsituted variables.
(This used to be commit e726ce5bc5
)
This commit is contained in:
@ -192,6 +192,21 @@ def substitute_var(text, values):
|
||||
return text
|
||||
|
||||
|
||||
def check_all_substituted(text):
|
||||
"""Make sure that all substitution variables in a string have been replaced.
|
||||
If not, raise an exception.
|
||||
|
||||
:param text: The text to search for substitution variables
|
||||
"""
|
||||
if not "${" in text:
|
||||
return
|
||||
|
||||
var_start = text.find("${")
|
||||
var_end = text.find("}", var_start)
|
||||
|
||||
raise Exception("Not all variables substituted: %s" % text[var_start:var_end])
|
||||
|
||||
|
||||
def valid_netbios_name(name):
|
||||
"""Check whether a name is valid as a NetBIOS name. """
|
||||
# FIXME: There are probably more constraints here.
|
||||
|
@ -67,6 +67,10 @@ class SubstituteVarTestCase(unittest.TestCase):
|
||||
def test_unknown_var(self):
|
||||
self.assertEquals("foo ${bla} gsff",
|
||||
samba.substitute_var("foo ${bla} gsff", {"bar": "bla"}))
|
||||
|
||||
def test_check_all_substituted(self):
|
||||
check_all_substituted("nothing to see here")
|
||||
self.assertRaises(Exception, check_all_substituted, "Not subsituted: ${FOOBAR}")
|
||||
|
||||
|
||||
class LdbExtensionTests(TestCaseInTempDir):
|
||||
|
Reference in New Issue
Block a user