r2783 - in dists/trunk/live-magic: livemagic/model tests

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-08-17 21:01:54 +0000 (Fri, 17 Aug 2007)
New Revision: 2783

Modified:
   dists/trunk/live-magic/livemagic/model/key_var_config_file.py
   dists/trunk/live-magic/livemagic/model/live_helper_configuration.py
   dists/trunk/live-magic/tests/test_folder_of_files.py
   dists/trunk/live-magic/tests/test_key_var_config_file.py
Log:
Renaming live-guihelper leftovers to live-magic.

Modified: dists/trunk/live-magic/livemagic/model/key_var_config_file.py
===================================================================
--- dists/trunk/live-magic/livemagic/model/key_var_config_file.py	2007-08-17 19:18:34 UTC (rev 2782)
+++ dists/trunk/live-magic/livemagic/model/key_var_config_file.py	2007-08-17 21:01:54 UTC (rev 2783)
@@ -136,7 +136,7 @@
                     lines[self._line_numbers[k] - 1] = line
                 except KeyError:
                     # Append line to end of file
-                    lines.append("\n# The following option was added by live-guihelper\n")
+                    lines.append("\n# The following option was added by live-magic\n")
                     lines.append(line)
             f.seek(0)
             f.writelines(lines)

Modified: dists/trunk/live-magic/livemagic/model/live_helper_configuration.py
===================================================================
--- dists/trunk/live-magic/livemagic/model/live_helper_configuration.py	2007-08-17 19:18:34 UTC (rev 2782)
+++ dists/trunk/live-magic/livemagic/model/live_helper_configuration.py	2007-08-17 21:01:54 UTC (rev 2783)
@@ -115,7 +115,7 @@
         """
         Creates and initialises a new configuration in a temporary folder.
         """
-        self.dir = tempfile.mkdtemp('live-guihelper')
+        self.dir = tempfile.mkdtemp('live-magic')
         res, out = commands.getstatusoutput('cd %s; lh_config' % self.dir)
         if res != 0: raise IOError, out
         self._load()

Modified: dists/trunk/live-magic/tests/test_folder_of_files.py
===================================================================
--- dists/trunk/live-magic/tests/test_folder_of_files.py	2007-08-17 19:18:34 UTC (rev 2782)
+++ dists/trunk/live-magic/tests/test_folder_of_files.py	2007-08-17 21:01:54 UTC (rev 2783)
@@ -10,7 +10,7 @@
 
 class TestFolderOfFiles(unittest.TestCase):
     def setUp(self):
-        self.dir = tempfile.mkdtemp('live-guihelper')
+        self.dir = tempfile.mkdtemp('live-magic')
         self.fof = model.FolderOfFiles(self.dir)
 
     def f_c(self, filename):
@@ -131,7 +131,7 @@
         assert len(self.fof.files) == 0
 
     def testImportFile(self):
-        fd, filename = tempfile.mkstemp('live-guihelper')
+        fd, filename = tempfile.mkstemp('live-magic')
         conf_name = filename.split(os.sep)[-1]
         os.write(fd, 'spam')
         os.close(fd)
@@ -140,7 +140,7 @@
         assert self.f_c(conf_name) == 'spam'
 
     def testImportFileNotSaved(self):
-        fd, filename = tempfile.mkstemp('live-guihelper')
+        fd, filename = tempfile.mkstemp('live-magic')
         conf_name = filename.split(os.sep)[-1]
         os.write(fd, 'spam')
         os.close(fd)
@@ -148,7 +148,7 @@
         self.assertRaises(IOError, self.f_c, conf_name)
 
     def testImportAlreadyExists(self):
-        fd, filename = tempfile.mkstemp('live-guihelper')
+        fd, filename = tempfile.mkstemp('live-magic')
         conf_name = filename.split('/')[-1]
         os.write(fd, 'file_to_import')
         os.close(fd)

Modified: dists/trunk/live-magic/tests/test_key_var_config_file.py
===================================================================
--- dists/trunk/live-magic/tests/test_key_var_config_file.py	2007-08-17 19:18:34 UTC (rev 2782)
+++ dists/trunk/live-magic/tests/test_key_var_config_file.py	2007-08-17 21:01:54 UTC (rev 2783)
@@ -10,7 +10,7 @@
 
 class TestKeyVarConfigFile(unittest.TestCase):
     def setUp(self):
-        fd, self.filename = tempfile.mkstemp('live-guihelper')
+        fd, self.filename = tempfile.mkstemp('live-magic')
         os.close(fd)
         spec = {
             'LH_SPAM': 'string',