Merge lp:~bialix/bzr-explorer/test into lp:bzr-explorer

[Alexander Belchenko]

[Alexander Belchenko (bialix)]

This branch fixes bug #488681 in the same manner as QBzr: we just catch ImportError in load_tests and simply emit warning about absent PyQt4 library.

[Ian Clatworthy (ian-clatworthy)]

Thank-you. Please merge.

review: Approve

=== modified file 'NEWS'
--- NEWS	2010-02-06 08:21:56 +0000
+++ NEWS	2010-02-06 13:45:23 +0000
@@ -12,6 +12,8 @@
 Bug fixes:
 
 * Fix toolbar appearance on OS X.
+* Handle absense of PyQt4 when running selftest.
+  (Alexander Belchenko, #488681)
 
 
 1.0.0beta1 05-Feb-2010

=== modified file 'tests/__init__.py'
--- tests/__init__.py	2009-07-08 20:28:10 +0000
+++ tests/__init__.py	2010-02-06 13:45:23 +0000
@@ -21,6 +21,7 @@
     TestCaseInTempDir,
     TestCaseWithTransport,
     )
+from bzrlib import trace
 
 
 class TestCaseWithQt(TestCaseWithTransport):
@@ -83,5 +84,13 @@
         'test_test_suite',
         'test_welcome',
     ]]
-    suite.addTests(loader.loadTestsFromModuleNames(mod_names))
+    for m in mod_names:
+        try:
+            suite.addTests(loader.loadTestsFromModuleName(m))
+        except ImportError, e:
+            if str(e).endswith('PyQt4'):
+                trace.note('Explorer: skip module %s '
+                    'because PyQt4 is not installed' % m)
+            else:
+                raise
     return suite