[SCM] live-magic branch, master, updated. 1.12-1-ge94a4cb
Daniel Baumann
daniel at debian.org
Tue Sep 7 19:33:17 UTC 2010
The following commit has been merged in the master branch:
commit e94a4cb3099cc77c9c58e9184c490587ddc77502
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Sep 7 21:29:38 2010 +0200
Replacing all live-helper references with live-build to work with live-build 2.0~a26 and newer.
diff --git a/DebianLive/__init__.py b/DebianLive/__init__.py
index 1e96f96..11558c2 100644
--- a/DebianLive/__init__.py
+++ b/DebianLive/__init__.py
@@ -45,7 +45,7 @@ class Config(object):
v = str(v).lower()
options.append("--%s='%s'" % (k.replace('_', '-'), v))
- cmd = 'cd "%s"; lh config --ignore-system-defaults %s' % (os.path.abspath(self.dir),
+ cmd = 'cd "%s"; lb config --ignore-system-defaults %s' % (os.path.abspath(self.dir),
' '.join(options))
print "*", cmd
diff --git a/DebianLive/spec.py b/DebianLive/spec.py
index bf33fa4..860fb5d 100644
--- a/DebianLive/spec.py
+++ b/DebianLive/spec.py
@@ -24,115 +24,115 @@ spec = {
'binary_hooks': (FolderOfFiles, 'binary_local-hooks'),
'binary': (KeyVar, {
- 'LH_BINARY_FILESYSTEM': str,
- 'LH_BINARY_IMAGES': list,
- 'LH_BINARY_INDICES': bool,
- 'LH_BOOTAPPEND_LIVE': str,
- 'LH_BOOTAPPEND_INSTALL': str,
- 'LH_BOOTLOADER': str,
- 'LH_CHECKSUMS': bool,
- 'LH_CHROOT_BUILD': bool,
- 'LH_DEBIAN_INSTALLER': bool,
- 'LH_DEBIAN_INSTALLER_DISTRIBUTION': str,
- 'LH_DEBIAN_INSTALLER_PRESEEDFILE': str,
- 'LH_ENCRYPTION': str,
- 'LH_GRUB_SPLASH': str,
- 'LH_HOSTNAME': str,
- 'LH_ISO_APPLICATION': str,
- 'LH_ISO_PREPARER': str,
- 'LH_ISO_PUBLISHER': str,
- 'LH_ISO_VOLUME': str,
- 'LH_JFFS2_ERASEBLOCK': str,
- 'LH_MEMTEST': str,
- 'LH_WIN32_LOADER': bool,
- 'LH_NET_ROOT_FILESYSTEM': str,
- 'LH_NET_ROOT_MOUNTOPTIONS': str,
- 'LH_NET_ROOT_PATH': str,
- 'LH_NET_ROOT_SERVER': str,
- 'LH_NET_COW_FILESYSTEM': str,
- 'LH_NET_COW_MOUNTOPTIONS': str,
- 'LH_NET_COW_PATH': str,
- 'LH_NET_COW_SERVER': str,
- 'LH_NET_TARBALL': str,
- 'LH_SYSLINUX_SPLASH': str,
- 'LH_SYSLINUX_TIMEOUT': int,
- 'LH_SYSLINUX_CFG': str,
- 'LH_SYSLINUX_MENU': bool,
- 'LH_SYSLINUX_MENU_LIVE_ENTRY': str,
- 'LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY': str,
- 'LH_SYSLINUX_MENU_MEMTEST_ENTRY': str,
- 'LH_USERNAME': str,
+ 'LB_BINARY_FILESYSTEM': str,
+ 'LB_BINARY_IMAGES': list,
+ 'LB_BINARY_INDICES': bool,
+ 'LB_BOOTAPPEND_LIVE': str,
+ 'LB_BOOTAPPEND_INSTALL': str,
+ 'LB_BOOTLOADER': str,
+ 'LB_CHECKSUMS': bool,
+ 'LB_CHROOT_BUILD': bool,
+ 'LB_DEBIAN_INSTALLER': bool,
+ 'LB_DEBIAN_INSTALLER_DISTRIBUTION': str,
+ 'LB_DEBIAN_INSTALLER_PRESEEDFILE': str,
+ 'LB_ENCRYPTION': str,
+ 'LB_GRUB_SPLASH': str,
+ 'LB_HOSTNAME': str,
+ 'LB_ISO_APPLICATION': str,
+ 'LB_ISO_PREPARER': str,
+ 'LB_ISO_PUBLISHER': str,
+ 'LB_ISO_VOLUME': str,
+ 'LB_JFFS2_ERASEBLOCK': str,
+ 'LB_MEMTEST': str,
+ 'LB_WIN32_LOADER': bool,
+ 'LB_NET_ROOT_FILESYSTEM': str,
+ 'LB_NET_ROOT_MOUNTOPTIONS': str,
+ 'LB_NET_ROOT_PATH': str,
+ 'LB_NET_ROOT_SERVER': str,
+ 'LB_NET_COW_FILESYSTEM': str,
+ 'LB_NET_COW_MOUNTOPTIONS': str,
+ 'LB_NET_COW_PATH': str,
+ 'LB_NET_COW_SERVER': str,
+ 'LB_NET_TARBALL': str,
+ 'LB_SYSLINUX_SPLASH': str,
+ 'LB_SYSLINUX_TIMEOUT': int,
+ 'LB_SYSLINUX_CFG': str,
+ 'LB_SYSLINUX_MENU': bool,
+ 'LB_SYSLINUX_MENU_LIVE_ENTRY': str,
+ 'LB_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY': str,
+ 'LB_SYSLINUX_MENU_MEMTEST_ENTRY': str,
+ 'LB_USERNAME': str,
}),
'bootstrap': (KeyVar, {
- 'LH_ARCHITECTURE': str,
- 'LH_BOOTSTRAP_CONFIG': str,
- 'LH_BOOTSTRAP_INCLUDE': str,
- 'LH_BOOTSTRAP_EXCLUDE': str,
- 'LH_BOOTSTRAP_FLAVOUR': str,
- 'LH_BOOTSTRAP_KEYRING': str,
- 'LH_DISTRIBUTION': str,
- 'LH_MIRROR_BOOTSTRAP': str,
- 'LH_MIRROR_CHROOT': str,
- 'LH_MIRROR_CHROOT_SECURITY': str,
- 'LH_MIRROR_BINARY': str,
- 'LH_MIRROR_BINARY_SECURITY': str,
- 'LH_CATEGORIES': list,
+ 'LB_ARCHITECTURE': str,
+ 'LB_BOOTSTRAP_CONFIG': str,
+ 'LB_BOOTSTRAP_INCLUDE': str,
+ 'LB_BOOTSTRAP_EXCLUDE': str,
+ 'LB_BOOTSTRAP_FLAVOUR': str,
+ 'LB_BOOTSTRAP_KEYRING': str,
+ 'LB_DISTRIBUTION': str,
+ 'LB_MIRROR_BOOTSTRAP': str,
+ 'LB_MIRROR_CHROOT': str,
+ 'LB_MIRROR_CHROOT_SECURITY': str,
+ 'LB_MIRROR_BINARY': str,
+ 'LB_MIRROR_BINARY_SECURITY': str,
+ 'LB_CATEGORIES': list,
}),
'chroot': (KeyVar, {
- 'LH_CHROOT_FILESYSTEM': str,
- 'LH_UNION_FILESYSTEM': str,
- 'LH_EXPOSED_ROOT': bool,
- 'LH_HOOKS': list,
- 'LH_INTERACTIVE': bool,
- 'LH_KEYRING_PACKAGES': list,
- 'LH_LANGUAGE': str,
- 'LH_LINUX_FLAVOURS': list,
- 'LH_LINUX_PACKAGES': list,
- 'LH_PACKAGES': list,
- 'LH_PACKAGES_LISTS': list,
- 'LH_TASKS': str,
- 'LH_SECURITY': bool,
- 'LH_SYMLINKS': bool,
- 'LH_SYSVINIT': bool,
+ 'LB_CHROOT_FILESYSTEM': str,
+ 'LB_UNION_FILESYSTEM': str,
+ 'LB_EXPOSED_ROOT': bool,
+ 'LB_HOOKS': list,
+ 'LB_INTERACTIVE': bool,
+ 'LB_KEYRING_PACKAGES': list,
+ 'LB_LANGUAGE': str,
+ 'LB_LINUX_FLAVOURS': list,
+ 'LB_LINUX_PACKAGES': list,
+ 'LB_PACKAGES': list,
+ 'LB_PACKAGES_LISTS': list,
+ 'LB_TASKS': str,
+ 'LB_SECURITY': bool,
+ 'LB_SYMLINKS': bool,
+ 'LB_SYSVINIT': bool,
}),
'common': (KeyVar, {
- 'LH_APT': str,
- 'LH_APT_FTP_PROXY': str,
- 'LH_APT_HTTP_PROXY': str,
- 'LH_APT_PDIFFS': bool,
- 'LH_APT_PIPELINE': int,
- 'LH_APT_RECOMMENDS': bool,
- 'LH_APT_SECURE': bool,
- 'LH_BOOTSTRAP': str,
- 'LH_CACHE': bool,
- 'LH_CACHE_INDICES': bool,
- 'LH_CACHE_PACKAGES': bool,
- 'LH_CACHE_STAGES': list,
- 'LH_DEBCONF_FRONTEND': str,
- 'LH_DEBCONF_NOWARNINGS': bool,
- 'LH_DEBCONF_PRIORITY': str,
- 'LH_INITRAMFS': str,
- 'LH_FDISK': str,
- 'LH_LOSETUP': str,
- 'LH_MODE': str,
- 'LH_USE_FAKEROOT': str,
- 'LH_TASKSEL': str,
- 'LH_INCLUDES': str,
- 'LH_TEMPLATES': str,
+ 'LB_APT': str,
+ 'LB_APT_FTP_PROXY': str,
+ 'LB_APT_HTTP_PROXY': str,
+ 'LB_APT_PDIFFS': bool,
+ 'LB_APT_PIPELINE': int,
+ 'LB_APT_RECOMMENDS': bool,
+ 'LB_APT_SECURE': bool,
+ 'LB_BOOTSTRAP': str,
+ 'LB_CACHE': bool,
+ 'LB_CACHE_INDICES': bool,
+ 'LB_CACHE_PACKAGES': bool,
+ 'LB_CACHE_STAGES': list,
+ 'LB_DEBCONF_FRONTEND': str,
+ 'LB_DEBCONF_NOWARNINGS': bool,
+ 'LB_DEBCONF_PRIORITY': str,
+ 'LB_INITRAMFS': str,
+ 'LB_FDISK': str,
+ 'LB_LOSETUP': str,
+ 'LB_MODE': str,
+ 'LB_USE_FAKEROOT': str,
+ 'LB_TASKSEL': str,
+ 'LB_INCLUDES': str,
+ 'LB_TEMPLATES': str,
- 'LH_BREAKPOINTS': bool,
- 'LH_DEBUG': bool,
- 'LH_FORCE': bool,
- 'LH_VERBOSE': bool,
- 'LH_QUIET': bool,
+ 'LB_BREAKPOINTS': bool,
+ 'LB_DEBUG': bool,
+ 'LB_FORCE': bool,
+ 'LB_VERBOSE': bool,
+ 'LB_QUIET': bool,
}),
'source': (KeyVar, {
- 'LH_SOURCE': bool,
- 'LH_SOURCE_IMAGES': list,
+ 'LB_SOURCE': bool,
+ 'LB_SOURCE_IMAGES': list,
}),
}
diff --git a/DebianLive/utils/sources_list.py b/DebianLive/utils/sources_list.py
index 832adff..ddc1d37 100644
--- a/DebianLive/utils/sources_list.py
+++ b/DebianLive/utils/sources_list.py
@@ -70,7 +70,7 @@ def get_mirror(fallback='http://www.us.debian.org/', sources_list='/etc/apt/sour
if defaults:
try:
kv = KeyVar('/etc/default', 'live-helper', {}, filename=defaults)
- kv_mirror = filter_mirror(kv['LH_MIRROR_BOOTSTRAP'])
+ kv_mirror = filter_mirror(kv['LB_MIRROR_BOOTSTRAP'])
if kv_mirror:
return kv_mirror
except:
diff --git a/LiveMagic/controllers/build.py b/LiveMagic/controllers/build.py
index 29ff416..3f0a862 100644
--- a/LiveMagic/controllers/build.py
+++ b/LiveMagic/controllers/build.py
@@ -99,7 +99,7 @@ class BuildController(object):
def ok_clean():
set_cleaning_status()
- _exec('lh clean --chroot --stage --source --cache',
+ _exec('lb clean --chroot --stage --source --cache',
'rm -rf auto/ config/ binary/ tftpboot/',
'chown -R %d:%d .' % (self.uid, self.gid))
return OK
@@ -111,7 +111,7 @@ class BuildController(object):
def failed_clean():
set_cleaning_status()
- _exec('lh clean --purge', 'rm -rvf auto/ config/',
+ _exec('lb clean --purge', 'rm -rvf auto/ config/',
'chown -R %d:%d .' % (self.uid, self.gid))
return FAILED
@@ -122,7 +122,7 @@ class BuildController(object):
def cancelled_clean():
set_cleaning_status()
- _exec('lh clean --purge', 'rm -rvf $(pwd)')
+ _exec('lb clean --purge', 'rm -rvf $(pwd)')
return CANCELLED
if self.state == BUILDING:
diff --git a/LiveMagic/views/wizard.py b/LiveMagic/views/wizard.py
index 36368fa..431fa35 100644
--- a/LiveMagic/views/wizard.py
+++ b/LiveMagic/views/wizard.py
@@ -148,8 +148,8 @@ class WizardView(object):
path = '/srv/debian-live'
try:
kv = KeyVar('/etc/default', 'live-helper', {}, filename='/etc/default/live-helper')
- server = kv.get('LH_NET_ROOT_SERVER', server)
- path = kv.get('LH_NET_ROOT_PATH', path)
+ server = kv.get('LB_NET_ROOT_SERVER', server)
+ path = kv.get('LB_NET_ROOT_PATH', path)
except IOError:
pass
self['entry_net_root_server'].set_text(server)
diff --git a/TODO b/TODO
index b029a57..b55ce8c 100644
--- a/TODO
+++ b/TODO
@@ -5,7 +5,7 @@ live-magic TODO
* Add simple package handling to wizard?
- * Add boolean for whether to use mirror as LH_MIRROR_BINARY mirror?
+ * Add boolean for whether to use mirror as LB_MIRROR_BINARY mirror?
(General)
@@ -18,15 +18,15 @@ live-magic TODO
* Tasks - task list sufficiently static? Probably needs its own page?
* Dependencies between options. For example, it doesn't make sense
- to display the LH_ISO_AUTHOR etc if the ISO binary type is not
+ to display the LB_ISO_AUTHOR etc if the ISO binary type is not
selected.
depends = [
- 'common/LH_ISO_APPLICATION': lambda: 'iso' in self.model.binary.LH_BINARY_IMAGES,
- 'common/LH_GRUB_SPLASH': lambda: self.model.binary.LH_BOOTLOADER == 'grub',
+ 'common/LB_ISO_APPLICATION': lambda: 'iso' in self.model.binary.LB_BINARY_IMAGES,
+ 'common/LB_GRUB_SPLASH': lambda: self.model.binary.LB_BOOTLOADER == 'grub',
]
- "Hidden" depends - eg. LH_BOOTSTRAP_KEYRING only makes sense when using
+ "Hidden" depends - eg. LB_BOOTSTRAP_KEYRING only makes sense when using
debootstrap (cdebootstrap does not have this option afaict).
(API)
@@ -38,12 +38,12 @@ live-magic TODO
#!/usr/bin/env python
from DebianLive import Config
- lh = Config('.')
+ lb = Config('.')
- lh.binary.LH_BINARY_IMAGES = ['iso', 'usb-hdd', 'net']
+ lb.binary.LB_BINARY_IMAGES = ['iso', 'usb-hdd', 'net']
for pkg_list in ['gnome', 'kde', 'standard', 'rescue']:
- lh.common.LH_PACKAGES_LISTS = pkg_list
- result = lh.build(save=True)
+ lb.common.LB_PACKAGES_LISTS = pkg_list
+ result = lb.build(save=True)
print type(result), result
# Would need some way of saving logs.
diff --git a/debian/control b/debian/control
index a01095d..1987cd5 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: http://live.debian.net/gitweb/?p=live-magic.git
Package: live-magic
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, live-build (>= 2.0~a21), python-glade2 (>= 2.10), python-gtk2, python-vte, gksu, xdg-utils
+Depends: ${misc:Depends}, ${python:Depends}, live-build (>= 2.0~a26), python-glade2 (>= 2.10), python-gtk2, python-vte, gksu, xdg-utils
Recommends: cdebootstrap
Description: GUI frontend to create Debian LiveCDs, netboot images, etc.
Live-helper is a collection of programs that can be used to build Debian Live
diff --git a/misc/live-magic-builder b/misc/live-magic-builder
index 2c0165f..b6a9575 100755
--- a/misc/live-magic-builder
+++ b/misc/live-magic-builder
@@ -36,7 +36,7 @@ Check () {
}
Clean () {
- lh clean --purge | tee -a ${LOG}
+ lb clean --purge | tee -a ${LOG}
}
Save_config () {
@@ -53,10 +53,10 @@ Check
Clean
Save_config
Set_status building
-Echo_verbose "lh build starting in $(pwd)"
+Echo_verbose "lb build starting in $(pwd)"
Echo_line
-lh build 2>&1 | tee -a ${LOG}
+lb build 2>&1 | tee -a ${LOG}
Echo_line
-Echo_verbose "lh build returned successfully"
+Echo_verbose "lb build returned successfully"
Set_status ok
exit 0
diff --git a/tests/test_config.py b/tests/test_config.py
index 427eaeb..9cccf71 100755
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -29,7 +29,7 @@ class TestConfig(unittest.TestCase):
def setUp(self):
import tempfile
self.dir = tempfile.mkdtemp()
- self.lh = Config(self.dir)
+ self.lb = Config(self.dir)
def tearDown(self):
import shutil
@@ -47,41 +47,41 @@ class TestSimple(TestConfig):
Config(self.dir)
def testStr(self):
- self.assertEqual(type(str(self.lh)), str)
+ self.assertEqual(type(str(self.lb)), str)
def testRepr(self):
- self.assertEqual(type(repr(self.lh)), str)
+ self.assertEqual(type(repr(self.lb)), str)
def testStrReprEquality(self):
- self.assertEqual(repr(self.lh), str(self.lh))
+ self.assertEqual(repr(self.lb), str(self.lb))
def testSave(self):
def contents():
return open(os.path.join(self.dir, 'config', 'common')).readlines()
before = contents()
- self.lh.common['LH_APT'] = 'spam'
- self.lh.save()
+ self.lb.common['LB_APT'] = 'spam'
+ self.lb.save()
- self.assert_('LH_APT="spam"\n' in contents())
+ self.assert_('LB_APT="spam"\n' in contents())
self.assertEqual(len(before), len(contents()))
class TestElements(TestConfig):
def testBinary(self):
from DebianLive.elements import KeyVar
- self.assertEqual(type(self.lh.binary), KeyVar)
+ self.assertEqual(type(self.lb.binary), KeyVar)
class TestSetGetOptions(TestConfig):
def testGet(self):
- self.assertEqual(self.lh.common['LH_DEBCONF_PRIORITY'], 'critical')
+ self.assertEqual(self.lb.common['LB_DEBCONF_PRIORITY'], 'critical')
def testSet(self):
- self.lh.common['LH_APT'] = 'spam'
- self.assertEqual(self.lh.common['LH_APT'], 'spam')
+ self.lb.common['LB_APT'] = 'spam'
+ self.assertEqual(self.lb.common['LB_APT'], 'spam')
def testSetUnknownOption(self):
- self.lh.common['LH_UNKNOWN_OPTION'] = 'spam'
- self.assertEqual(self.lh.common['LH_UNKNOWN_OPTION'], 'spam')
+ self.lb.common['LB_UNKNOWN_OPTION'] = 'spam'
+ self.assertEqual(self.lb.common['LB_UNKNOWN_OPTION'], 'spam')
if __name__ == "__main__":
unittest.main()
diff --git a/tests/test_config_constructor.py b/tests/test_config_constructor.py
index c57866a..3c55905 100755
--- a/tests/test_config_constructor.py
+++ b/tests/test_config_constructor.py
@@ -36,39 +36,39 @@ class TestConfigConstructor(unittest.TestCase):
class TestSimple(TestConfigConstructor):
def testArch386(self):
- lh = Config(self.dir, architecture='i386')
- self.assertEqual(lh.bootstrap['LH_ARCHITECTURE'], 'i386')
+ lb = Config(self.dir, architecture='i386')
+ self.assertEqual(lb.bootstrap['LB_ARCHITECTURE'], 'i386')
def testArchAmd64(self):
- lh = Config(self.dir, architecture='amd64')
- self.assertEqual(lh.bootstrap['LH_ARCHITECTURE'], 'amd64')
+ lb = Config(self.dir, architecture='amd64')
+ self.assertEqual(lb.bootstrap['LB_ARCHITECTURE'], 'amd64')
def testNoOptions(self):
- lh = Config(self.dir)
+ lb = Config(self.dir)
def testInvalid(self):
self.assertRaises(TypeError, Config, self.dir, this_config_never_exists='value')
class TestOther(TestConfigConstructor):
def testArchChangesKernelFlavour(self):
- lh_i386 = Config(self.dir, architecture='i386')
+ lb_i386 = Config(self.dir, architecture='i386')
self.setUp()
- lh_amd64 = Config(self.dir, architecture='amd64')
- self.assertNotEqual(lh_i386.chroot['LH_LINUX_FLAVOURS'],
- lh_amd64.chroot['LH_LINUX_FLAVOURS'])
+ lb_amd64 = Config(self.dir, architecture='amd64')
+ self.assertNotEqual(lb_i386.chroot['LB_LINUX_FLAVOURS'],
+ lb_amd64.chroot['LB_LINUX_FLAVOURS'])
def testHyphenatedOption(self):
- lh = Config(self.dir, packages_lists='my-package-list')
- self.assertEqual(lh.chroot['LH_PACKAGES_LISTS'], ['my-package-list'])
+ lb = Config(self.dir, packages_lists='my-package-list')
+ self.assertEqual(lb.chroot['LB_PACKAGES_LISTS'], ['my-package-list'])
def testSpaceInValue(self):
- lh = Config(self.dir, packages_lists="hello there")
- self.assertEqual(lh.chroot['LH_PACKAGES_LISTS'], ['hello', 'there'])
+ lb = Config(self.dir, packages_lists="hello there")
+ self.assertEqual(lb.chroot['LB_PACKAGES_LISTS'], ['hello', 'there'])
def testAllowPassingOptionsSecondTime(self):
- lh = Config(self.dir, packages_lists="one two")
- lh = Config(self.dir, packages_lists="three four")
- self.assertEqual(lh.chroot['LH_PACKAGES_LISTS'], ['three', 'four'])
+ lb = Config(self.dir, packages_lists="one two")
+ lb = Config(self.dir, packages_lists="three four")
+ self.assertEqual(lb.chroot['LB_PACKAGES_LISTS'], ['three', 'four'])
if __name__ == "__main__":
unittest.main()
diff --git a/tests/test_key_var.py b/tests/test_key_var.py
index 0206324..18e336a 100755
--- a/tests/test_key_var.py
+++ b/tests/test_key_var.py
@@ -26,17 +26,17 @@ from DebianLive.elements import KeyVar
class TestKeyVar(unittest.TestCase):
spec = {
- 'LH_SPAM': str,
- 'LH_MORE_SPAM': str,
- 'LH_SPAM_LIST' : list,
- 'LH_SPAM_BOOL' : bool,
+ 'LB_SPAM': str,
+ 'LB_MORE_SPAM': str,
+ 'LB_SPAM_LIST' : list,
+ 'LB_SPAM_BOOL' : bool,
}
initial = """
- LH_SPAM="eggs"
- LH_MORE_SPAM="more eggs"
- LH_SPAM_LIST="spam eggs ham bacon"
- LH_SPAM_BOOL="false"
+ LB_SPAM="eggs"
+ LB_MORE_SPAM="more eggs"
+ LB_SPAM_LIST="spam eggs ham bacon"
+ LB_SPAM_BOOL="false"
"""
name = 'test_key_var'
@@ -70,22 +70,22 @@ class TestKeyVar(unittest.TestCase):
class TestSimple(TestKeyVar):
def testSetAndGetOption(self):
- self.key_var['LH_SPAM'] = 'eggs'
- self.assertEqual(self.key_var['LH_SPAM'], 'eggs')
+ self.key_var['LB_SPAM'] = 'eggs'
+ self.assertEqual(self.key_var['LB_SPAM'], 'eggs')
def testSetAndGetOptionSpecifyFilename(self):
self.key_var = KeyVar('/', 'dummy', self.spec, filename=self.filename)
- self.key_var['LH_SPAM'] = 'eggs'
- self.assertEqual(self.key_var['LH_SPAM'], 'eggs')
+ self.key_var['LB_SPAM'] = 'eggs'
+ self.assertEqual(self.key_var['LB_SPAM'], 'eggs')
def testSaveKnownOption(self):
- self.key_var['LH_SPAM'] = 'new value'
+ self.key_var['LB_SPAM'] = 'new value'
self.key_var.save()
- self.assert_('LH_SPAM="new value"' in self.f_c())
+ self.assert_('LB_SPAM="new value"' in self.f_c())
def testSaveKnownOptionNoChange(self):
before = self.f_c()
- self.key_var['LH_SPAM'] = 'eggs'
+ self.key_var['LB_SPAM'] = 'eggs'
self.key_var.save()
self.assertEqual(before, self.f_c())
@@ -93,13 +93,13 @@ class TestSimple(TestKeyVar):
"""
Unknown configuration keys should be added to the file.
"""
- self.key_var['LH_UNKNOWN_OPTION'] = 'spam'
+ self.key_var['LB_UNKNOWN_OPTION'] = 'spam'
self.key_var.save()
- self.assert_('LH_UNKNOWN_OPTION="spam"' in self.f_c())
+ self.assert_('LB_UNKNOWN_OPTION="spam"' in self.f_c())
def testSaveUnknownOptionNewSize(self):
len_before = len(self.f_c())
- self.key_var['LH_UKNOWN_OPTION'] = 'new value'
+ self.key_var['LB_UKNOWN_OPTION'] = 'new value'
self.key_var.save()
self.assert_(len(self.f_c()) > len_before)
@@ -118,9 +118,9 @@ class TestSaveEscaped(TestKeyVar):
r'\ '[:-1] : r'\\ '[:-1],
}
for input, expected in tests.iteritems():
- self.key_var['LH_TEST'] = input
+ self.key_var['LB_TEST'] = input
self.key_var.save()
- self.assert_('LH_TEST="%s"' % expected in self.f_c(), \
+ self.assert_('LB_TEST="%s"' % expected in self.f_c(), \
"Input was '%s', expected '%s'" % (input, expected))
class TestLoadEscaped(TestKeyVar):
@@ -138,12 +138,12 @@ class TestLoadEscaped(TestKeyVar):
for input, expected in tests.iteritems():
# Write escaped string
- self.initial = 'LH_SPAM="%s"' % input
+ self.initial = 'LB_SPAM="%s"' % input
# Reload configuration and check against expected value
self.reset()
- self.assert_(self.key_var['LH_SPAM'] == expected, \
- "Got back '%s', expected '%s'" % (self.key_var['LH_SPAM'], expected))
+ self.assert_(self.key_var['LB_SPAM'] == expected, \
+ "Got back '%s', expected '%s'" % (self.key_var['LB_SPAM'], expected))
class TestAccept(TestKeyVar):
"""
@@ -153,31 +153,31 @@ class TestAccept(TestKeyVar):
def assertAccepts(self, input):
self.initial = input
self.reset()
- self.assertEquals(self.key_var['LH_SPAM'], 'eggs')
+ self.assertEquals(self.key_var['LB_SPAM'], 'eggs')
def testNormal(self):
- self.assertAccepts(r'LH_SPAM="eggs"')
+ self.assertAccepts(r'LB_SPAM="eggs"')
def testSpacing(self):
- self.assertAccepts(r"LH_SPAM='eggs' ")
+ self.assertAccepts(r"LB_SPAM='eggs' ")
def testSpacingBoth(self):
- self.assertAccepts(r' LH_SPAM="eggs" ')
+ self.assertAccepts(r' LB_SPAM="eggs" ')
def testTwoComments(self):
- self.assertAccepts(r'LH_SPAM="eggs" # comment # comment ')
+ self.assertAccepts(r'LB_SPAM="eggs" # comment # comment ')
def testCommentsWithQuotes(self):
- self.assertAccepts(r'LH_SPAM="eggs" # comment with a " " sign')
+ self.assertAccepts(r'LB_SPAM="eggs" # comment with a " " sign')
def testSpacingEnd(self):
- self.assertAccepts(r'LH_SPAM="eggs" ')
+ self.assertAccepts(r'LB_SPAM="eggs" ')
def testNoQuotes(self):
- self.assertAccepts(r'LH_SPAM=eggs')
+ self.assertAccepts(r'LB_SPAM=eggs')
def testNoQuotesSpacing(self):
- self.assertAccepts(r'LH_SPAM=eggs ')
+ self.assertAccepts(r'LB_SPAM=eggs ')
class TestAllignmentReject(TestKeyVar):
def testNonStandardAlignmentRejection(self):
@@ -185,12 +185,12 @@ class TestAllignmentReject(TestKeyVar):
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'#LB_SPAM="eggs"', # commented out
+ r'LB_SPAM ="eggs"',
+ r'LB_SPAM= "eggs"',
+ r'LB_SPAM="eggs',
+ r'LB_SPAM=eggs"',
+ r'LB_SPAM=spam eggs',
]
for r in reject:
self.initial = r
@@ -208,67 +208,67 @@ class TestSaveLists(TestKeyVar):
]
for k, v in expected:
- self.key_var['LH_SPAM_LIST'] = k
+ self.key_var['LB_SPAM_LIST'] = k
self.key_var.save()
- assert 'LH_SPAM_LIST="%s"' % v in self.f_c()
+ assert 'LB_SPAM_LIST="%s"' % v in self.f_c()
class TestLists(TestKeyVar):
def testAppend(self):
- self.key_var['LH_SPAM_LIST'].append('ketchup')
- self.assert_('LH_SPAM_LIST' in self.key_var.stale)
+ self.key_var['LB_SPAM_LIST'].append('ketchup')
+ self.assert_('LB_SPAM_LIST' in self.key_var.stale)
def testSetItem(self):
- self.key_var['LH_SPAM_LIST'][0] = 'ketchup'
- self.assert_('LH_SPAM_LIST' in self.key_var.stale)
+ self.key_var['LB_SPAM_LIST'][0] = 'ketchup'
+ self.assert_('LB_SPAM_LIST' in self.key_var.stale)
def testDelItem(self):
- del self.key_var['LH_SPAM_LIST'][0]
- self.assert_('LH_SPAM_LIST' in self.key_var.stale)
+ del self.key_var['LB_SPAM_LIST'][0]
+ self.assert_('LB_SPAM_LIST' in self.key_var.stale)
def testSetSlice(self):
- self.key_var['LH_SPAM_LIST'][:] = []
- self.assert_('LH_SPAM_LIST' in self.key_var.stale)
+ self.key_var['LB_SPAM_LIST'][:] = []
+ self.assert_('LB_SPAM_LIST' in self.key_var.stale)
def testDelSlice(self):
- del self.key_var['LH_SPAM_LIST'][:]
- self.assert_('LH_SPAM_LIST' in self.key_var.stale)
+ del self.key_var['LB_SPAM_LIST'][:]
+ self.assert_('LB_SPAM_LIST' in self.key_var.stale)
def testPop(self):
- self.key_var['LH_SPAM_LIST'].pop()
- self.assert_('LH_SPAM_LIST' in self.key_var.stale)
+ self.key_var['LB_SPAM_LIST'].pop()
+ self.assert_('LB_SPAM_LIST' in self.key_var.stale)
def testExtend(self):
- self.key_var['LH_SPAM_LIST'].extend(range(3))
- self.assert_('LH_SPAM_LIST' in self.key_var.stale)
+ self.key_var['LB_SPAM_LIST'].extend(range(3))
+ self.assert_('LB_SPAM_LIST' in self.key_var.stale)
def testInsert(self):
- self.key_var['LH_SPAM_LIST'].insert(0, 'spam')
- self.assert_('LH_SPAM_LIST' in self.key_var.stale)
+ self.key_var['LB_SPAM_LIST'].insert(0, 'spam')
+ self.assert_('LB_SPAM_LIST' in self.key_var.stale)
def testRemove(self):
- self.key_var['LH_SPAM_LIST'].remove('spam')
- self.assert_('LH_SPAM_LIST' in self.key_var.stale)
+ self.key_var['LB_SPAM_LIST'].remove('spam')
+ self.assert_('LB_SPAM_LIST' in self.key_var.stale)
def testReverse(self):
- self.key_var['LH_SPAM_LIST'].reverse()
- self.assert_('LH_SPAM_LIST' in self.key_var.stale)
+ self.key_var['LB_SPAM_LIST'].reverse()
+ self.assert_('LB_SPAM_LIST' in self.key_var.stale)
def testSort(self):
- self.key_var['LH_SPAM_LIST'].sort()
- self.assert_('LH_SPAM_LIST' in self.key_var.stale)
+ self.key_var['LB_SPAM_LIST'].sort()
+ self.assert_('LB_SPAM_LIST' in self.key_var.stale)
def testSetList(self):
- self.key_var['LH_SPAM_LIST'] = ['spam']
+ self.key_var['LB_SPAM_LIST'] = ['spam']
self.key_var.save()
- self.key_var['LH_SPAM_LIST'].append('ketchup')
- self.assert_('LH_SPAM_LIST' in self.key_var.stale)
+ self.key_var['LB_SPAM_LIST'].append('ketchup')
+ self.assert_('LB_SPAM_LIST' in self.key_var.stale)
class TestLoadLists(TestKeyVar):
def assertLoadsAs(self, input, expected):
- self.initial = 'LH_SPAM_LIST="%s"' % input
+ self.initial = 'LB_SPAM_LIST="%s"' % input
self.reset()
- self.assertEqual(self.key_var['LH_SPAM_LIST'], expected)
+ self.assertEqual(self.key_var['LB_SPAM_LIST'], expected)
def testEmptyString(self):
self.assertLoadsAs("", [])
@@ -281,9 +281,9 @@ class TestLoadLists(TestKeyVar):
class TestBoolSave(TestKeyVar):
def assertSavesAs(self, input, expected):
- self.key_var['LH_SPAMBOOL'] = input
+ self.key_var['LB_SPAMBOOL'] = input
self.key_var.save()
- assert 'LH_SPAMBOOL="%s"' % expected in self.f_c()
+ assert 'LB_SPAMBOOL="%s"' % expected in self.f_c()
def testSaveNone(self):
self.assertSavesAs(None, '')
@@ -296,9 +296,9 @@ class TestBoolSave(TestKeyVar):
class TestBoolLoad(TestKeyVar):
def assertParsesAs(self, input, expected):
- self.initial = 'LH_SPAM_BOOL="%s"' % input
+ self.initial = 'LB_SPAM_BOOL="%s"' % input
self.reset()
- self.assertEqual(self.key_var['LH_SPAM_BOOL'], expected)
+ self.assertEqual(self.key_var['LB_SPAM_BOOL'], expected)
def testEnabled(self):
self.assertParsesAs('true', True)
diff --git a/tests/test_sources_list.py b/tests/test_sources_list.py
index 524b5c5..1b352cc 100755
--- a/tests/test_sources_list.py
+++ b/tests/test_sources_list.py
@@ -99,7 +99,7 @@ class TestDefaults(TestSourcesList):
def testDefaults(self):
mirror = 'http://test.com/debian'
self.f_w("bogus", self.filename)
- self.f_w("LH_MIRROR_BOOTSTRAP=\"%s\"" % mirror, self.defaults)
+ self.f_w("LB_MIRROR_BOOTSTRAP=\"%s\"" % mirror, self.defaults)
ret = get_mirror(None, sources_list=self.filename, defaults=self.defaults)
self.assertEqual(ret, mirror)
--
live-magic
More information about the debian-live-changes
mailing list