Merge lp:~eeejay/mago/tweaks into lp:~mago-contributors/mago/mago-1.0

[Eitan Isaacson]

[Eitan Isaacson (eeejay)]

Hey!
This adds a screenshot comparer to checks.py, and other minor changes.

=== modified file 'bin/ubuntu-desktop-test'
--- bin/ubuntu-desktop-test	2009-03-04 12:27:22 +0000
+++ bin/ubuntu-desktop-test	2009-03-04 14:30:30 +0000
@@ -109,7 +109,7 @@
 
     suite = os.path.basename(file)
 
-    pattern = r"[a-z0-9][-_a-z0-9+.]*.xml"
+    pattern = r"[a-z0-9][-_a-z0-9+.]*.xml$"
     if not re.match(pattern, suite, re.I):
         logging.debug("Suite name `%s' does not match pattern: %s",
             file, pattern)

=== modified file 'desktoptesting/check.py'
--- desktoptesting/check.py	2008-08-21 11:18:49 +0000
+++ desktoptesting/check.py	2009-03-04 10:34:51 +0000
@@ -6,6 +6,8 @@
 import filecmp
 import os
 import sys
+import shutil
+from ldtputils import imagecompare
 
 FAIL = "fail"
 PASS = "pass"
@@ -36,7 +38,7 @@
 
         if not (os.path.exists(oracle) and os.path.exists(test)):
             print "Both oracle and test file must exist"
-            sys.exit(0)
+            raise Exception
 
         self.oracle = oracle
         self.test   = test
@@ -52,5 +54,13 @@
         else:
             return FAIL
 
-
-
+class ScreenshotCompare(FileComparison):
+    def perform_test(self, max_diff=0.0):
+        res = imagecompare(self.oracle, self.test)
+        if res > max_diff:
+            return FAIL
+        else:
+            return PASS
+
+    def calibrate(self):
+        shutil.copy(self.test, self.oracle)