[SCM] debian-live/autotesting branch, master, updated. 466610cf8f86159906de9d490f728cae4587de81

[Brendan M. Sleight (none)]

The following commit has been merged in the master branch:
commit 466610cf8f86159906de9d490f728cae4587de81
Author: Brendan M. Sleight <bms at brum.(none)>
Date:   Thu Jul 9 00:29:55 2009 +0100

    More correcting of typos.

diff --git a/README b/README
index 01f7ce3..b42d210 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@ EXAMPLE TESTS.XML
 =================
 
 <autotesting>
-  </tests>
+  <tests>
     <test> 
       <download>http://127.0.0.1/autotesting/debian-live-501-i386-xfce-desktop.iso</download>
       <title>Debian Live (xfce)</title>
diff --git a/README.setup b/README.setup
index 0a184c8..869163c 100644
--- a/README.setup
+++ b/README.setup
@@ -47,7 +47,7 @@ To be able to view the results of autotesting a webserver is helpful.
 
 Commands:-
   adduser autotesting www-data
-  apt get install apache2-mpm-prefork
+  apt-get install apache2-mpm-prefork
   mkdir /var/www/autotesting
   chown www-data.www-data /var/www/autotesting/
   chmod g+w /var/www/autotesting
diff --git a/autotesting.py b/autotesting.py
index c2b7cf4..ae97bf4 100644
--- a/autotesting.py
+++ b/autotesting.py
@@ -200,9 +200,12 @@ def createMontage(video, test):
         ffmpeg = ["ffmpeg", "-i", video.name, "-an", "-ss", str(ss), "-t", 
                   "01", "-r", "1", "-y", frameName]
         retcode = subprocess.call(ffmpeg)
-        shutil.move(frameNameOut, frame.name)
-        listFramesNames.append(frame.name)
-        listFrames.append(frame)
+        try:
+            shutil.move(frameNameOut, frame.name)
+            listFramesNames.append(frame.name)
+            listFrames.append(frame)
+        except:
+            pass
     montageCommand = ["montage", "-geometry", "180x135+4+4", "-frame", "5"]
     for frame in listFramesNames:
         montageCommand.append(frame)

-- 
debian-live/autotesting