[SCM] GUI front-end for Debian Live. branch, master, updated. b31041e1c016fdfc5060d40c763344c8246de176
Chris Lamb
chris at chris-lamb.co.uk
Tue Sep 18 23:48:54 UTC 2007
The branch, master has been updated
via b31041e1c016fdfc5060d40c763344c8246de176 (commit)
from c923dc8ae72b4427c46a3d138c5ea7cfa601e2be (commit)
- Shortlog ------------------------------------------------------------
b31041e * Change a number of references to LH_ variables.
Summary of changes:
livemagic/model/key_var_config_file.py | 2 +-
livemagic/model/live_helper_configuration.py | 50 +++++++-------
tests/test_key_var_config_file.py | 90 +++++++++++++-------------
tests/test_live_helper_configuration.py | 22 +++---
4 files changed, 82 insertions(+), 82 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit b31041e1c016fdfc5060d40c763344c8246de176
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Wed Sep 19 00:48:40 2007 +0100
* Change a number of references to LH_ variables.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/livemagic/model/key_var_config_file.py b/livemagic/model/key_var_config_file.py
index 0c33f92..abe3d6f 100644
--- a/livemagic/model/key_var_config_file.py
+++ b/livemagic/model/key_var_config_file.py
@@ -30,7 +30,7 @@ class KeyVarConfigFile(object):
"""
Returns True if var is a configuration variable for Debian Live.
"""
- return var.startswith('LH_') or var.startswith('LIVE_')
+ return var.startswith('LIVE_') or var.startswith('LIVE_')
def __setattr__(self, k, v):
if self.is_lh_variable(k):
diff --git a/livemagic/model/live_helper_configuration.py b/livemagic/model/live_helper_configuration.py
index 2f153b5..9dd9eda 100644
--- a/livemagic/model/live_helper_configuration.py
+++ b/livemagic/model/live_helper_configuration.py
@@ -10,34 +10,34 @@ from folder_of_files import FolderOfFiles
spec_str = """
key_value:
common:
- LH_APT : string
- LH_APT_FTPPROXY : string
- LH_APT_HTTPPROXY : string
- LH_APT_PDIFFS : boolean
- LH_APT_PIPELINE : int
- LH_APT_RECOMMENDS : boolean
- LH_APT_SECURE : boolean
- LH_BOOTSTRAP : string
- LH_CACHE_INDICES : boolean
- LH_CACHE_PACKAGES : boolean
- LH_CACHE_STAGES : list
- LH_DEBCONF_FRONTEND : string
- LH_DEBCONF_NOWARNINGS : boolean
- LH_DEBCONF_PRIORITY : string
- LH_GENISOIMAGE : string
- LH_INITRAMFS : string
- LH_LOSETUP : string
- LH_MODE : string
- LH_ROOT_COMMAND : string
- LH_TASKSEL : string
+ LIVE_APT : string
+ LIVE_APT_FTPPROXY : string
+ LIVE_APT_HTTPPROXY : string
+ LIVE_APT_PDIFFS : boolean
+ LIVE_APT_PIPELINE : int
+ LIVE_APT_RECOMMENDS : boolean
+ LIVE_APT_SECURE : boolean
+ LIVE_BOOTSTRAP : string
+ LIVE_CACHE_INDICES : boolean
+ LIVE_CACHE_PACKAGES : boolean
+ LIVE_CACHE_STAGES : list
+ LIVE_DEBCONF_FRONTEND : string
+ LIVE_DEBCONF_NOWARNINGS : boolean
+ LIVE_DEBCONF_PRIORITY : string
+ LIVE_GENISOIMAGE : string
+ LIVE_INITRAMFS : string
+ LIVE_LOSETUP : string
+ LIVE_MODE : string
+ LIVE_ROOT_COMMAND : string
+ LIVE_TASKSEL : string
LIVE_ROOT : string
LIVE_INCLUDES : string
LIVE_TEMPLATES : string
- LH_BREAKPOINTS : boolean
- LH_DEBUG : boolean
- LH_FORCE : boolean
- LH_QUIET : boolean
- LH_VERBOSE : boolean
+ LIVE_BREAKPOINTS : boolean
+ LIVE_DEBUG : boolean
+ LIVE_FORCE : boolean
+ LIVE_QUIET : boolean
+ LIVE_VERBOSE : boolean
bootstrap:
LIVE_ARCHITECTURE : list
diff --git a/tests/test_key_var_config_file.py b/tests/test_key_var_config_file.py
index ad9b690..1cc5f2d 100755
--- a/tests/test_key_var_config_file.py
+++ b/tests/test_key_var_config_file.py
@@ -13,10 +13,10 @@ class TestKeyVarConfigFile(unittest.TestCase):
fd, self.filename = tempfile.mkstemp('live-magic')
os.close(fd)
spec = {
- 'LH_SPAM': 'string',
- 'LH_MORESPAM': 'string',
- 'LH_SPAMLIST' : 'list',
- 'LH_SPAMBOOL' : 'boolean',
+ 'LIVE_SPAM': 'string',
+ 'LIVE_MORESPAM': 'string',
+ 'LIVE_SPAMLIST' : 'list',
+ 'LIVE_SPAMBOOL' : 'boolean',
}
self.keyvar = model.KeyVarConfigFile(self.filename, spec)
@@ -31,34 +31,34 @@ class TestKeyVarConfigFile(unittest.TestCase):
f.close()
def testSetAndGetOption(self):
- self.keyvar.LH_SPAM = "eggs"
- assert self.keyvar.LH_SPAM == "eggs"
+ self.keyvar.LIVE_SPAM = "eggs"
+ assert self.keyvar.LIVE_SPAM == "eggs"
def testSaveKnownOption(self):
- self.keyvar.LH_SPAM = "eggs"
+ self.keyvar.LIVE_SPAM = "eggs"
self.keyvar.save()
- assert 'LH_SPAM="eggs"\n' in self.f_c()
+ assert 'LIVE_SPAM="eggs"\n' in self.f_c()
def testSaveUnknownOption(self):
"""
Unknown configuration keys should be added to the file.
"""
assert len(self.f_c()) == 0
- self.keyvar.LH_SPAM = "eggs"
+ self.keyvar.LIVE_SPAM = "eggs"
self.keyvar.save()
- assert 'LH_SPAM="eggs"\n' in self.f_c()
+ assert 'LIVE_SPAM="eggs"\n' in self.f_c()
def testUpdatesOptions(self):
"""
Updating an existing option should not increase the length of the file.
"""
- self.keyvar.LH_SPAM = "eggs"
- self.keyvar.LH_MORESPAM = "moreeggs"
+ self.keyvar.LIVE_SPAM = "eggs"
+ self.keyvar.LIVE_MORESPAM = "moreeggs"
self.keyvar.save()
self.keyvar.save()
self.keyvar.load()
save = len(self.f_c())
- self.keyvar.LH_SPAM = "yetmoreeggs"
+ self.keyvar.LIVE_SPAM = "yetmoreeggs"
self.keyvar.save()
assert len(self.f_c()) == save
@@ -67,7 +67,7 @@ class TestKeyVarConfigFile(unittest.TestCase):
Should change state when they have been altered.
"""
assert self.keyvar.altered() == False
- self.keyvar.LH_SPAM = "eggs"
+ self.keyvar.LIVE_SPAM = "eggs"
assert self.keyvar.altered() == True
def testConfLoadResetState(self):
@@ -75,11 +75,11 @@ class TestKeyVarConfigFile(unittest.TestCase):
Reloading the configuration should reset state.
"""
assert self.keyvar.altered() == False
- self.keyvar.LH_SPAM = "eggs"
+ self.keyvar.LIVE_SPAM = "eggs"
assert self.keyvar.altered() == True
self.keyvar.load()
assert self.keyvar.altered() == False
- assert not hasattr(self.keyvar, 'LH_SPAM')
+ assert not hasattr(self.keyvar, 'LIVE_SPAM')
def testSavingEscapingCharacters(self):
"""
@@ -92,9 +92,9 @@ class TestKeyVarConfigFile(unittest.TestCase):
r'\ '[:-1] : r'\\ '[:-1],
}
for input, expected in tests.iteritems():
- self.keyvar.LH_TEST = input
+ self.keyvar.LIVE_TEST = input
self.keyvar.save()
- self.assert_('LH_TEST="%s"\n' % expected in self.f_c(), \
+ self.assert_('LIVE_TEST="%s"\n' % expected in self.f_c(), \
"Input was '%s', expected '%s'" % (input, expected))
def testLoadingEscapedCharacters(self):
@@ -111,26 +111,26 @@ class TestKeyVarConfigFile(unittest.TestCase):
for input, expected in tests.iteritems():
# Write escaped string
- self.f_w('LH_SPAM="%s"' % input)
+ self.f_w('LIVE_SPAM="%s"' % input)
# Reload configuration and check against expected value
self.keyvar.load()
- self.assert_(self.keyvar.LH_SPAM == expected, \
- "Got back '%s', expected '%s'" % (self.keyvar.LH_SPAM, expected))
+ self.assert_(self.keyvar.LIVE_SPAM == expected, \
+ "Got back '%s', expected '%s'" % (self.keyvar.LIVE_SPAM, expected))
def testNonStandardAlignmentAcceptance(self):
"""
Tests acceptance of strange alignments/configurations/spacings of KEY="value" pairs.
"""
accept = [
- r'LH_SPAM="eggs"',
- r' LH_SPAM="eggs" ',
- r'LH_SPAM="eggs" # comment # comment ',
- r'LH_SPAM="eggs" # comment with a " " sign',
- r'LH_SPAM="eggs" ',
- r'LH_SPAM=eggs',
- r'LH_SPAM=eggs ',
- r"LH_SPAM='eggs' ",
+ r'LIVE_SPAM="eggs"',
+ r' LIVE_SPAM="eggs" ',
+ r'LIVE_SPAM="eggs" # comment # comment ',
+ r'LIVE_SPAM="eggs" # comment with a " " sign',
+ r'LIVE_SPAM="eggs" ',
+ r'LIVE_SPAM=eggs',
+ r'LIVE_SPAM=eggs ',
+ r"LIVE_SPAM='eggs' ",
]
for a in accept:
self.f_w(a)
@@ -139,7 +139,7 @@ class TestKeyVarConfigFile(unittest.TestCase):
self.keyvar.load()
msg = "Should have accepted '%s'" % a
try:
- self.assert_(self.keyvar.LH_SPAM == 'eggs', msg + ", saw '%s'" % self.keyvar.LH_SPAM)
+ self.assert_(self.keyvar.LIVE_SPAM == 'eggs', msg + ", saw '%s'" % self.keyvar.LIVE_SPAM)
except AttributeError:
self.fail(msg=msg)
@@ -148,19 +148,19 @@ class TestKeyVarConfigFile(unittest.TestCase):
Tests rejection strange alignments/configurations/spacings of KEY="value" pairs.
"""
reject = [
- r'#LH_SPAM="eggs"', # commented out
- r'LH_SPAM ="eggs"',
- r'LH_SPAM= "eggs"',
- r'LH_SPAM="eggs',
- r'LH_SPAM=eggs"',
- r'LH_SPAM=spam eggs',
+ r'#LIVE_SPAM="eggs"', # commented out
+ r'LIVE_SPAM ="eggs"',
+ r'LIVE_SPAM= "eggs"',
+ r'LIVE_SPAM="eggs',
+ r'LIVE_SPAM=eggs"',
+ r'LIVE_SPAM=spam eggs',
]
for r in reject:
self.f_w(r)
# Reload configuration and check against expected value
self.keyvar.load()
- self.assert_(not hasattr(self.keyvar, 'LH_SPAM'), "Should have rejected '%s'" % r)
+ self.assert_(not hasattr(self.keyvar, 'LIVE_SPAM'), "Should have rejected '%s'" % r)
def testSaveList(self):
expected = [
@@ -172,9 +172,9 @@ class TestKeyVarConfigFile(unittest.TestCase):
]
for k, v in expected:
- self.keyvar.LH_SPAMLIST = k
+ self.keyvar.LIVE_SPAMLIST = k
self.keyvar.save()
- assert 'LH_SPAMLIST="%s"\n' % v in self.f_c()
+ assert 'LIVE_SPAMLIST="%s"\n' % v in self.f_c()
def testLoadList(self):
expected = {
@@ -184,9 +184,9 @@ class TestKeyVarConfigFile(unittest.TestCase):
}
for k, v in expected.iteritems():
- self.f_w('LH_SPAMLIST="%s"' % k)
+ self.f_w('LIVE_SPAMLIST="%s"' % k)
self.keyvar.load()
- assert self.keyvar.LH_SPAMLIST == v
+ assert self.keyvar.LIVE_SPAMLIST == v
def testSaveBool(self):
expected = {
@@ -196,9 +196,9 @@ class TestKeyVarConfigFile(unittest.TestCase):
}
for k, v in expected.iteritems():
- self.keyvar.LH_SPAMBOOL = k
+ self.keyvar.LIVE_SPAMBOOL = k
self.keyvar.save()
- assert 'LH_SPAMBOOL="%s"\n' % v in self.f_c()
+ assert 'LIVE_SPAMBOOL="%s"\n' % v in self.f_c()
def testBooleanTypeLoad(self):
expected = {
@@ -210,9 +210,9 @@ class TestKeyVarConfigFile(unittest.TestCase):
}
for k, v in expected.iteritems():
- self.f_w('LH_SPAMBOOL="%s"' % k)
+ self.f_w('LIVE_SPAMBOOL="%s"' % k)
self.keyvar.load()
- assert self.keyvar.LH_SPAMBOOL == v
+ assert self.keyvar.LIVE_SPAMBOOL == v
if __name__ == "__main__":
unittest.main()
diff --git a/tests/test_live_helper_configuration.py b/tests/test_live_helper_configuration.py
index 065ca16..a1c6c45 100755
--- a/tests/test_live_helper_configuration.py
+++ b/tests/test_live_helper_configuration.py
@@ -26,33 +26,33 @@ class TestConfiguration(unittest.TestCase):
"""
new() should load a new configuration.
"""
- self.conf.common.LH_SPAM = "eggs"
+ self.conf.common.LIVE_SPAM = "eggs"
self.conf.save()
saved_dir = self.conf.dir
self.conf.new()
- assert not hasattr(self.conf.common, 'LH_SPAM')
+ assert not hasattr(self.conf.common, 'LIVE_SPAM')
self.conf.open(saved_dir)
- assert self.conf.common.LH_SPAM == "eggs"
+ assert self.conf.common.LIVE_SPAM == "eggs"
def testGetOption(self):
- assert "apt" in self.conf.common.LH_APT
+ assert "apt" in self.conf.common.LIVE_APT
def testSetKnownOption(self):
- self.conf.common.LH_APT = "apt-get"
- assert self.conf.common.LH_APT == "apt-get"
+ self.conf.common.LIVE_APT = "apt-get"
+ assert self.conf.common.LIVE_APT == "apt-get"
def testSetUnknownOption(self):
- self.conf.common.LH_UNKNOWN_OPTION = "Testing value"
- assert self.conf.common.LH_UNKNOWN_OPTION == "Testing value"
+ self.conf.common.LIVE_UNKNOWN_OPTION = "Testing value"
+ assert self.conf.common.LIVE_UNKNOWN_OPTION == "Testing value"
def testChildAlteredState(self):
"""
Object should change state when a child object changes state.
"""
assert self.conf.altered() == False
- self.conf.common.LH_SPAM = "eggs"
+ self.conf.common.LIVE_SPAM = "eggs"
assert self.conf.altered() == True
def testConfLoadResetState(self):
@@ -60,10 +60,10 @@ class TestConfiguration(unittest.TestCase):
Reloading the configuration should reset state.
"""
assert self.conf.altered() == False
- self.conf.common.LH_SPAM = "eggs"
+ self.conf.common.LIVE_SPAM = "eggs"
assert self.conf.altered() == True
self.conf.reload()
- assert not hasattr(self.conf.common, 'LH_SPAM')
+ assert not hasattr(self.conf.common, 'LIVE_SPAM')
assert self.conf.altered() == False
if __name__ == "__main__":
--
GUI front-end for Debian Live.
More information about the debian-live-changes
mailing list