[SCM] GUI front-end for Debian Live. branch, master, updated. 2aa27fb9aa2e10e8f65fe0a35343e24c14a861b5

[Chris Lamb]

The following commit has been merged in the master branch:
commit bf7ec7c25f00320918648de19df7ec385f7f79e1
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sun Jul 13 01:54:24 2008 +0100

    100% test coverage.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/DebianLive/elements/key_var.py b/DebianLive/elements/key_var.py
index 5ecd65d..305ca5b 100644
--- a/DebianLive/elements/key_var.py
+++ b/DebianLive/elements/key_var.py
@@ -30,7 +30,6 @@ class KeyVar(dict):
         else:
             self.filename = filename
 
-
         f = open(self.filename, 'r')
         try:
             line_no = 0
diff --git a/tests/test_key_var.py b/tests/test_key_var.py
index c0b0b8d..dba5580 100755
--- a/tests/test_key_var.py
+++ b/tests/test_key_var.py
@@ -56,6 +56,11 @@ class TestSimple(TestKeyVar):
         self.key_var['LH_SPAM'] = 'eggs'
         self.assertEqual(self.key_var['LH_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')
+
     def testSaveKnownOption(self):
         self.key_var['LH_SPAM'] = 'new value'
         self.key_var.save()
diff --git a/tests/test_sources_list.py b/tests/test_sources_list.py
index cc4070e..ec2f98b 100755
--- a/tests/test_sources_list.py
+++ b/tests/test_sources_list.py
@@ -20,8 +20,11 @@ class TestSourcesList(unittest.TestCase):
         except OSError:
             pass
 
-    def f_w(self, contents):
-        f = open(self.filename, 'w+')
+    def f_w(self, contents, filename=None):
+        if filename is None:
+            f = open(self.filename, 'w+')
+        else:
+            f = open(filename, 'w+')
         f.write(contents)
         f.close()
 
@@ -50,6 +53,9 @@ class TestNoMatch(TestSourcesList):
     def testComments(self):
         self.assertNoMatchLine('# comment')
 
+    def testBogus(self):
+        self.assertNoMatchLine('bogus')
+
     def testSecurity(self):
         self.assertNoMatchLine('deb http://security.debian.org/debian stable main')
 
@@ -60,6 +66,24 @@ class TestErrors(TestSourcesList):
     def testFileNotFound(self):
         self.failIf(get_mirror(None, sources_list='/proc/invisible-file', defaults=None))
 
+class TestDefaults(TestSourcesList):
+    def setUp(self):
+        TestSourcesList.setUp(self)
+        import tempfile
+        fd, self.defaults  = tempfile.mkstemp('live-magic')
+        os.close(fd)
+
+    def testDefaults(self):
+        mirror = 'http://test.com/debian'
+        self.f_w("bogus", self.filename)
+        self.f_w("LH_MIRROR_BOOTSTRAP=\"%s\"" % mirror, self.defaults)
+        ret = get_mirror(None, sources_list=self.filename, defaults=self.defaults)
+        self.assertEqual(ret, mirror)
+
+    def testDefaultsIOError(self):
+        self.f_w("bogus", self.filename)
+        ret = get_mirror('fallback', sources_list=self.filename, defaults='/proc/nosuchfile')
+        self.assertEqual(ret, 'fallback')
 """
 # Not implemented yet
 

-- 
GUI front-end for Debian Live.