Merge extensions/python/xpcom changes from DOM_AGNOSTIC2_BRANCH into the

trunk.


git-svn-id: svn://10.0.0.236/trunk@187878 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/extensions/python/xpcom/test/test_comfile.py

@@ -36,6 +36,14 @@
 # ***** END LICENSE BLOCK *****
 
 """Test the xpcom.file module."""
-# Called "test_comfile" as Python has a standard test called test_file :-(
+from pyxpcom_test_tools import suite_from_functions, testmain
+
 import xpcom.file
-xpcom.file._TestAll()
+
+# Make this test run under our std test suite
+def suite():
+    return suite_from_functions(xpcom.file._TestAll)
+
+if __name__=='__main__':
+    testmain()
+