Bug 605978 Land Mozmill 1.5.1 and tests into M-C r=ctalbert a=NPOTB

--HG--
rename : testing/mozmill/jsbridge-2.4.0/MANIFEST.in => testing/mozmill/jsbridge/MANIFEST.in
rename : testing/mozmill/jsbridge-2.4.0/jsbridge/__init__.py => testing/mozmill/jsbridge/jsbridge/__init__.py
rename : testing/mozmill/jsbridge-2.4.0/jsbridge/extension/chrome.manifest => testing/mozmill/jsbridge/jsbridge/extension/chrome.manifest
rename : testing/mozmill/jsbridge-2.4.0/jsbridge/extension/chrome/content/overlay.js => testing/mozmill/jsbridge/jsbridge/extension/chrome/content/overlay.js
rename : testing/mozmill/jsbridge-2.4.0/jsbridge/extension/chrome/content/overlay.xul => testing/mozmill/jsbridge/jsbridge/extension/chrome/content/overlay.xul
rename : testing/mozmill/jsbridge-2.4.0/jsbridge/extension/components/cmdarg.js => testing/mozmill/jsbridge/jsbridge/extension/components/cmdarg.js
rename : testing/mozmill/jsbridge-2.4.0/jsbridge/extension/install.rdf => testing/mozmill/jsbridge/jsbridge/extension/install.rdf
rename : testing/mozmill/jsbridge-2.4.0/jsbridge/extension/resource/modules/events.js => testing/mozmill/jsbridge/jsbridge/extension/resource/modules/events.js
rename : testing/mozmill/jsbridge-2.4.0/jsbridge/extension/resource/modules/init.js => testing/mozmill/jsbridge/jsbridge/extension/resource/modules/init.js
rename : testing/mozmill/jsbridge-2.4.0/jsbridge/extension/resource/modules/json2.js => testing/mozmill/jsbridge/jsbridge/extension/resource/modules/json2.js
rename : testing/mozmill/jsbridge-2.4.0/jsbridge/extension/resource/modules/server.js => testing/mozmill/jsbridge/jsbridge/extension/resource/modules/server.js
rename : testing/mozmill/jsbridge-2.4.0/jsbridge/jsobjects.py => testing/mozmill/jsbridge/jsbridge/jsobjects.py
rename : testing/mozmill/jsbridge-2.4.0/jsbridge/network.py => testing/mozmill/jsbridge/jsbridge/network.py
rename : testing/mozmill/jsbridge-2.4.0/setup.py => testing/mozmill/jsbridge/setup.py
rename : testing/mozmill/mozmill-1.5.0/MANIFEST.in => testing/mozmill/mozmill/MANIFEST.in
rename : testing/mozmill/mozmill-1.5.0/docs/Makefile => testing/mozmill/mozmill/docs/Makefile
rename : testing/mozmill/mozmill-1.5.0/docs/_build/doctrees/environment.pickle => testing/mozmill/mozmill/docs/_build/doctrees/environment.pickle
rename : testing/mozmill/mozmill-1.5.0/docs/_build/doctrees/index.doctree => testing/mozmill/mozmill/docs/_build/doctrees/index.doctree
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/_sources/index.txt => testing/mozmill/mozmill/docs/_build/html/_sources/index.txt
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/contents.png => testing/mozmill/mozmill/docs/_build/html/_static/contents.png
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/default.css => testing/mozmill/mozmill/docs/_build/html/_static/default.css
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/doctools.js => testing/mozmill/mozmill/docs/_build/html/_static/doctools.js
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/file.png => testing/mozmill/mozmill/docs/_build/html/_static/file.png
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/jquery.js => testing/mozmill/mozmill/docs/_build/html/_static/jquery.js
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/minus.png => testing/mozmill/mozmill/docs/_build/html/_static/minus.png
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/navigation.png => testing/mozmill/mozmill/docs/_build/html/_static/navigation.png
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/plus.png => testing/mozmill/mozmill/docs/_build/html/_static/plus.png
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/pygments.css => testing/mozmill/mozmill/docs/_build/html/_static/pygments.css
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/rightsidebar.css => testing/mozmill/mozmill/docs/_build/html/_static/rightsidebar.css
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/searchtools.js => testing/mozmill/mozmill/docs/_build/html/_static/searchtools.js
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/sphinxdoc.css => testing/mozmill/mozmill/docs/_build/html/_static/sphinxdoc.css
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/stickysidebar.css => testing/mozmill/mozmill/docs/_build/html/_static/stickysidebar.css
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/_static/traditional.css => testing/mozmill/mozmill/docs/_build/html/_static/traditional.css
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/genindex.html => testing/mozmill/mozmill/docs/_build/html/genindex.html
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/index.html => testing/mozmill/mozmill/docs/_build/html/index.html
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/modindex.html => testing/mozmill/mozmill/docs/_build/html/modindex.html
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/objects.inv => testing/mozmill/mozmill/docs/_build/html/objects.inv
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/search.html => testing/mozmill/mozmill/docs/_build/html/search.html
rename : testing/mozmill/mozmill-1.5.0/docs/_build/html/searchindex.js => testing/mozmill/mozmill/docs/_build/html/searchindex.js
rename : testing/mozmill/mozmill-1.5.0/docs/conf.py => testing/mozmill/mozmill/docs/conf.py
rename : testing/mozmill/mozmill-1.5.0/docs/index.rst => testing/mozmill/mozmill/docs/index.rst
rename : testing/mozmill/mozmill-1.5.0/mozmill/__init__.py => testing/mozmill/mozmill/mozmill/__init__.py
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/build.xml => testing/mozmill/mozmill/mozmill/extension/build.xml
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/chrome-jar.manifest => testing/mozmill/mozmill/mozmill/extension/chrome-jar.manifest
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/chrome.manifest => testing/mozmill/mozmill/mozmill/extension/chrome.manifest
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/chrome.js => testing/mozmill/mozmill/mozmill/extension/content/chrome.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/fg.menu.css => testing/mozmill/mozmill/mozmill/extension/content/css/fg.menu.css
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/mozmill.css => testing/mozmill/mozmill/mozmill/extension/content/css/mozmill.css
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png => testing/mozmill/mozmill/mozmill/extension/content/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png => testing/mozmill/mozmill/mozmill/extension/content/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png => testing/mozmill/mozmill/mozmill/extension/content/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png => testing/mozmill/mozmill/mozmill/extension/content/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png => testing/mozmill/mozmill/mozmill/extension/content/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png => testing/mozmill/mozmill/mozmill/extension/content/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png => testing/mozmill/mozmill/mozmill/extension/content/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png => testing/mozmill/mozmill/mozmill/extension/content/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-icons_222222_256x240.png => testing/mozmill/mozmill/mozmill/extension/content/css/smoothness/images/ui-icons_222222_256x240.png
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-icons_2e83ff_256x240.png => testing/mozmill/mozmill/mozmill/extension/content/css/smoothness/images/ui-icons_2e83ff_256x240.png
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-icons_454545_256x240.png => testing/mozmill/mozmill/mozmill/extension/content/css/smoothness/images/ui-icons_454545_256x240.png
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-icons_888888_256x240.png => testing/mozmill/mozmill/mozmill/extension/content/css/smoothness/images/ui-icons_888888_256x240.png
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/images/ui-icons_cd0a0a_256x240.png => testing/mozmill/mozmill/mozmill/extension/content/css/smoothness/images/ui-icons_cd0a0a_256x240.png
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/css/smoothness/jquery-ui-1.7.1.custom.css => testing/mozmill/mozmill/mozmill/extension/content/css/smoothness/jquery-ui-1.7.1.custom.css
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/dx.js => testing/mozmill/mozmill/mozmill/extension/content/dx.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/dxwindow.xul => testing/mozmill/mozmill/mozmill/extension/content/dxwindow.xul
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/editor/bespin/BespinEmbedded.css => testing/mozmill/mozmill/mozmill/extension/content/editor/bespin/BespinEmbedded.css
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/editor/bespin/BespinEmbedded.js => testing/mozmill/mozmill/mozmill/extension/content/editor/bespin/BespinEmbedded.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/editor/bespin/BespinMain.js => testing/mozmill/mozmill/mozmill/extension/content/editor/bespin/BespinMain.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/editor/bespin/BespinWorker.js => testing/mozmill/mozmill/mozmill/extension/content/editor/bespin/BespinWorker.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/editor/bespin/resources/screen_theme/theme.less => testing/mozmill/mozmill/mozmill/extension/content/editor/bespin/resources/screen_theme/theme.less
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/editor/editor.js => testing/mozmill/mozmill/mozmill/extension/content/editor/editor.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/img/wmIcon.png => testing/mozmill/mozmill/mozmill/extension/content/img/wmIcon.png
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/inspector.js => testing/mozmill/mozmill/mozmill/extension/content/inspector.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/jquery/fg.menu.css => testing/mozmill/mozmill/mozmill/extension/content/jquery/fg.menu.css
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/jquery/fg.menu.js => testing/mozmill/mozmill/mozmill/extension/content/jquery/fg.menu.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/jquery/jquery-1.3.2.min.js => testing/mozmill/mozmill/mozmill/extension/content/jquery/jquery-1.3.2.min.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/jquery/jquery-ui-1.7.1.custom.min.js => testing/mozmill/mozmill/mozmill/extension/content/jquery/jquery-ui-1.7.1.custom.min.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/jquery/jquery.ui.core.js => testing/mozmill/mozmill/mozmill/extension/content/jquery/jquery.ui.core.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/jquery/jquery.ui.menu.js => testing/mozmill/mozmill/mozmill/extension/content/jquery/jquery.ui.menu.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/menus.js => testing/mozmill/mozmill/mozmill/extension/content/menus.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/mozmill.html => testing/mozmill/mozmill/mozmill/extension/content/mozmill.html
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/mozmill.js => testing/mozmill/mozmill/mozmill/extension/content/mozmill.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/mozmill.xul => testing/mozmill/mozmill/mozmill/extension/content/mozmill.xul
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/output.js => testing/mozmill/mozmill/mozmill/extension/content/output.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/overlay.js => testing/mozmill/mozmill/mozmill/extension/content/overlay.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/overlay.xul => testing/mozmill/mozmill/mozmill/extension/content/overlay.xul
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/overlay_tb.xul => testing/mozmill/mozmill/mozmill/extension/content/overlay_tb.xul
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/prefs.xul => testing/mozmill/mozmill/mozmill/extension/content/prefs.xul
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/rec.js => testing/mozmill/mozmill/mozmill/extension/content/rec.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/shell.js => testing/mozmill/mozmill/mozmill/extension/content/shell.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/shortcuts.js => testing/mozmill/mozmill/mozmill/extension/content/shortcuts.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/testwindow.xul => testing/mozmill/mozmill/mozmill/extension/content/testwindow.xul
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/content/ui.js => testing/mozmill/mozmill/mozmill/extension/content/ui.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/defaults/preferences/debug.js => testing/mozmill/mozmill/mozmill/extension/defaults/preferences/debug.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/install.rdf => testing/mozmill/mozmill/mozmill/extension/install.rdf
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/locale/en-US/mozmill.dtd => testing/mozmill/mozmill/mozmill/extension/locale/en-US/mozmill.dtd
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/locale/en-US/overlay.dtd => testing/mozmill/mozmill/mozmill/extension/locale/en-US/overlay.dtd
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/readme.txt => testing/mozmill/mozmill/mozmill/extension/readme.txt
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/controller.js => testing/mozmill/mozmill/mozmill/extension/resource/modules/controller.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/elementslib.js => testing/mozmill/mozmill/mozmill/extension/resource/modules/elementslib.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/events.js => testing/mozmill/mozmill/mozmill/extension/resource/modules/events.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/frame.js => testing/mozmill/mozmill/mozmill/extension/resource/modules/frame.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/init.js => testing/mozmill/mozmill/mozmill/extension/resource/modules/init.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/inspection.js => testing/mozmill/mozmill/mozmill/extension/resource/modules/inspection.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/jum.js => testing/mozmill/mozmill/mozmill/extension/resource/modules/jum.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/mozmill.js => testing/mozmill/mozmill/mozmill/extension/resource/modules/mozmill.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/utils.js => testing/mozmill/mozmill/mozmill/extension/resource/modules/utils.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/stdlib/EventUtils.js => testing/mozmill/mozmill/mozmill/extension/resource/stdlib/EventUtils.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/stdlib/arrays.js => testing/mozmill/mozmill/mozmill/extension/resource/stdlib/arrays.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/stdlib/dom.js => testing/mozmill/mozmill/mozmill/extension/resource/stdlib/dom.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/stdlib/httpd.js => testing/mozmill/mozmill/mozmill/extension/resource/stdlib/httpd.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/stdlib/json2.js => testing/mozmill/mozmill/mozmill/extension/resource/stdlib/json2.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/stdlib/objects.js => testing/mozmill/mozmill/mozmill/extension/resource/stdlib/objects.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/stdlib/os.js => testing/mozmill/mozmill/mozmill/extension/resource/stdlib/os.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/stdlib/strings.js => testing/mozmill/mozmill/mozmill/extension/resource/stdlib/strings.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/stdlib/withs.js => testing/mozmill/mozmill/mozmill/extension/resource/stdlib/withs.js
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/skin/chrome.css => testing/mozmill/mozmill/mozmill/extension/skin/chrome.css
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/skin/overlay.css => testing/mozmill/mozmill/mozmill/extension/skin/overlay.css
rename : testing/mozmill/mozmill-1.5.0/mozmill/extension/zipexclude.lst => testing/mozmill/mozmill/mozmill/extension/zipexclude.lst
rename : testing/mozmill/mozmill-1.5.0/setup.py => testing/mozmill/mozmill/setup.py
rename : testing/mozmill/mozmill-1.5.0/test/test_python_callbacks_callbacks.py => testing/mozmill/mozmill/test/test_python_callbacks_callbacks.py
rename : testing/mozmill/mozrunner-2.5.1/mozrunner/__init__.py => testing/mozmill/mozrunner/mozrunner/__init__.py
rename : testing/mozmill/mozrunner-2.5.1/mozrunner/killableprocess.py => testing/mozmill/mozrunner/mozrunner/killableprocess.py
rename : testing/mozmill/mozrunner-2.5.1/mozrunner/qijo.py => testing/mozmill/mozrunner/mozrunner/qijo.py
rename : testing/mozmill/mozrunner-2.5.1/mozrunner/winprocess.py => testing/mozmill/mozrunner/mozrunner/winprocess.py
rename : testing/mozmill/mozrunner-2.5.1/mozrunner/wpk.py => testing/mozmill/mozrunner/mozrunner/wpk.py
rename : testing/mozmill/mozrunner-2.5.1/setup.py => testing/mozmill/mozrunner/setup.py

testing/mozmill/Makefile.in

@@ -59,9 +59,9 @@ include $(topsrcdir)/config/rules.mk
 # which is normally not desirable,
 TEST_HARNESS_PACKAGES = \
   simplejson-2.1.1 \
-  mozrunner-2.5.1 \
-  jsbridge-2.4.0 \
-  mozmill-1.5.0 \
+  mozrunner \
+  jsbridge \
+  mozmill \
   $(NULL)
 
 TEST_FILES := \

testing/mozmill/jsbridge-2.4.0/PKG-INFO

@@ -1,16 +0,0 @@
-Metadata-Version: 1.0
-Name: jsbridge
-Version: 2.4.0
-Summary: Python to JavaScript bridge interface.
-Home-page: http://github.com/mozautomation/mozmill
-Author: Mikeal Rogers, Mozilla
-Author-email: mikeal.rogers@gmail.com
-License: http://www.apache.org/licenses/LICENSE-2.0
-Description: A powerful and extensible Python to JavaScript bridge interface.
-Platform: Any
-Classifier: Development Status :: 4 - Beta
-Classifier: Environment :: Console
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Operating System :: OS Independent
-Classifier: Topic :: Software Development :: Libraries :: Python Modules

testing/mozmill/jsbridge-2.4.0/setup.cfg

@@ -1,5 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-tag_svn_revision = 0
-

testing/mozmill/jsbridge/jsbridge/__init__.py

@@ -51,7 +51,6 @@ settings_env = 'JSBRIDGE_SETTINGS_FILE'
 
 parent = os.path.abspath(os.path.dirname(__file__))
 extension_path = os.path.join(parent, 'extension')
-xpi_path = os.path.join(parent, 'xpi')
 
 window_string = "Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('')"
 
@@ -92,7 +91,7 @@ class CLI(mozrunner.CLI):
     parser_options = copy.copy(mozrunner.CLI.parser_options)
     parser_options[('-D', '--debug',)] = dict(dest="debug", 
                                              action="store_true",
-                                             help="Install debugging addons.", 
+                                             help="Debug mode", 
                                              metavar="JSBRIDGE_DEBUG",
                                              default=False )
     parser_options[('-s', '--shell',)] = dict(dest="shell", 
@@ -106,20 +105,14 @@ class CLI(mozrunner.CLI):
     parser_options[('-P', '--port')] = dict(dest="port", default="24242",
                                             help="TCP port to run jsbridge on.")
 
-    debug_addons = []
-    if os.path.exists(xpi_path):
-        debug_addons = [os.path.join(xpi_path, x) for x
-                        in os.listdir(xpi_path)]
-
     def get_profile(self, *args, **kwargs):
         if self.options.debug:
-            kwargs.setdefault('preferences', 
-                              {}).update({'extensions.checkCompatibility':False})
+            kwargs.setdefault('preferences', {}).update({
+              'extensions.checkCompatibility':False,
+              'devtools.errorconsole.enabled':True
+            })
         profile = mozrunner.CLI.get_profile(self, *args, **kwargs)
         profile.install_addon(extension_path)
-        if self.options.debug:
-            for addon in self.debug_addons:
-                profile.install_addon(addon)
         return profile
         
     def get_runner(self, *args, **kwargs):

testing/mozmill/jsbridge/jsbridge/extension/chrome/content/overlay.js

@@ -35,6 +35,6 @@
 // 
 // ***** END LICENSE BLOCK *****
 
-var __init = {}; Components.utils.import('resource://jsbridge/modules/init.js', __init);
+var jsbridgeInit = {}; Components.utils.import('resource://jsbridge/modules/init.js',jsbridgeInit);
 
 

testing/mozmill/jsbridge/jsbridge/extension/install.rdf

@@ -4,7 +4,7 @@
    <Description about="urn:mozilla:install-manifest">
      <em:id>jsbridge@mozilla.com</em:id>
      <em:name>jsbridge</em:name>
-     <em:version>2.4.0</em:version>
+     <em:version>2.4.1</em:version>
      <em:creator>Mikeal Rogers</em:creator>
      <em:description>Python to JavaScript bridge</em:description>
      <em:targetApplication>

testing/mozmill/jsbridge/setup.py

@@ -42,9 +42,9 @@ desc = """Python to JavaScript bridge interface."""
 summ = """A powerful and extensible Python to JavaScript bridge interface."""
 
 PACKAGE_NAME = "jsbridge"
-PACKAGE_VERSION = "2.4.0"
+PACKAGE_VERSION = "2.4.1"
 
-requires = ['mozrunner >= 2.5.0']
+requires = ['mozrunner == 2.5.2']
 
 if not sys.version.startswith('2.6'):
     requires.append('simplejson')

testing/mozmill/mozmill-1.5.0/PKG-INFO

@@ -1,16 +0,0 @@
-Metadata-Version: 1.0
-Name: mozmill
-Version: 1.5.0
-Summary: UI Automation tool for Mozilla applications.
-Home-page: http://github.com/mozautomation/mozmill
-Author: Mozilla, Mikeal Rogers
-Author-email: mikeal.rogers@gmail.com
-License: http://www.apache.org/licenses/LICENSE-2.0
-Description: A tool for full UI automation of Mozilla applications.
-Platform: Any
-Classifier: Development Status :: 4 - Beta
-Classifier: Environment :: Console
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Operating System :: OS Independent
-Classifier: Topic :: Software Development :: Libraries :: Python Modules

testing/mozmill/mozmill-1.5.0/mozmill/extension/content/overlay.js

@@ -1,86 +0,0 @@
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-// 
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-// 
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-// 
-// The Original Code is Mozilla Corporation Code.
-// 
-// The Initial Developer of the Original Code is
-// Adam Christian.
-// Portions created by the Initial Developer are Copyright (C) 2008
-// the Initial Developer. All Rights Reserved.
-// 
-// Contributor(s):
-//  Adam Christian <adam.christian@gmail.com>
-//  Mikeal Rogers <mikeal.rogers@gmail.com>
-// 
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-// 
-// ***** END LICENSE BLOCK *****
-
-var utils = {}; Components.utils.import('resource://mozmill/modules/utils.js', utils);
-var init = {}; Components.utils.import('resource://mozmill/modules/init.js', init);
-
-var MozMill = {
-  onLoad: function() {
-    // initialization code
-    this.initialized = true;
-  },
-
-  onMenuItemCommand: function() {
-    var mmWindows = utils.getWindowByTitle('MozMill IDE');
-    if (!mmWindows){
-      var height = utils.getPreference("mozmill.height", 740);
-      var width = utils.getPreference("mozmill.width", 635);
-      //move to top left corner
-      var left = utils.getPreference("mozmill.screenX", 0);
-      var top = utils.getPreference("mozmill.screenY", 0);
-
-      if (left == 0){
-        //make only browser windows big
-        var width = window.screen.availWidth/2.5;
-        var height = window.screen.availHeight;
-        window.resizeTo((window.screen.availWidth - width), window.screen.availHeight);
-
-        var height = window.innerHeight;
-        var left = window.innerWidth; 
-      }
-      
-      var paramString = "chrome,resizable,height=" + height +
-                               ",width=" + width + ",left="+left+",top="+top;
-      var w = window.open("chrome://mozmill/content/mozmill.xul", "", paramString);
-    } else { mmWindows[0].focus(); }
-  }
-};
-
-window.addEventListener("load", function(e) { MozMill.onLoad(e); }, false);
-
- 
-function mozMillTestWindow() {
-  window.openDialog("chrome://mozmill/content/testwindow.html", "_blank", "chrome,dialog=no, resizable");
-}
-
-//adding a mozmill keyboard shortcut
-// window.addEventListener("keypress", function(e) { 
-//   if ((e.charCode == 109) && (e.ctrlKey)) { 
-//     MozMill.onMenuItemCommand(e); 
-//   } 
-// }, false);

testing/mozmill/mozmill-1.5.0/mozmill/extension/resource/modules/init.js

@@ -1,101 +0,0 @@
-// ***** BEGIN LICENSE BLOCK *****
-// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-// 
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-// 
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-// 
-// The Original Code is Mozilla Corporation Code.
-// 
-// The Initial Developer of the Original Code is
-// Adam Christian.
-// Portions created by the Initial Developer are Copyright (C) 2008
-// the Initial Developer. All Rights Reserved.
-// 
-// Contributor(s):
-//  Adam Christian <adam.christian@gmail.com>
-//  Mikeal Rogers <mikeal.rogers@gmail.com>
-// 
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-// 
-// ***** END LICENSE BLOCK *****
-
-var EXPORTED_SYMBOLS = ["mozmill"];
-
-var mozmill = Components.utils.import('resource://mozmill/modules/mozmill.js');
-var utils = {}; Components.utils.import('resource://mozmill/modules/utils.js', utils);
-var enumerator = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                   .getService(Components.interfaces.nsIWindowMediator)
-                   .getEnumerator("");
-
-
-
-while(enumerator.hasMoreElements()) {
-  var win = enumerator.getNext();
-  win.documentLoaded = true;
-  
-  try {
-    win.content.documentLoaded = true;
-  } catch(e){}
-
-  win.addEventListener("DOMContentLoaded", function(event) {
-    win.documentLoaded = true;
-    
-    //try attaching a listener to the dom content for load and beforeunload
-    //so that we can properly set the documentLoaded flag
-    try {
-      win.content.addEventListener("load", function(event) {
-        win.content.documentLoaded = true;
-      }, false);
-      win.content.addEventListener("beforeunload", function(event) {
-        win.content.documentLoaded = false;
-      }, false);
-    } catch(err){}
-
-  }, false);
-  
-};
-
-//when a new dom window gets opened
-var observer = {
-  observe: function(subject,topic,data){
-      subject.addEventListener("DOMContentLoaded", function(event) {
-        subject.documentLoaded = true;
-        
-        //try attaching a listener to the dom content for load and beforeunload
-        //so that we can properly set the documentLoaded flag
-        try {
-          subject.content.addEventListener("load", function(event) {
-            subject.content.documentLoaded = true;
-          }, false);
-          subject.content.addEventListener("beforeunload", function(event) {
-            subject.content.documentLoaded = false;
-          }, false);
-        } catch(err){}
-
-      }, false);  
-  }
-};
-
-var observerService =
-  Components.classes["@mozilla.org/observer-service;1"]
-    .getService(Components.interfaces.nsIObserverService);
-
-observerService.addObserver(observer, "toplevel-window-ready", false);
-

testing/mozmill/mozmill-1.5.0/setup.cfg

@@ -1,5 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-tag_svn_revision = 0
-

testing/mozmill/mozmill/mozmill/__init__.py

@@ -395,7 +395,7 @@ class MozMill(object):
 
     def get_report(self):
         """get the report results"""
-        format = "%Y-%m-%dT%H:%M:%S"
+        format = "%Y-%m-%dT%H:%M:%SZ"
 
         assert self.test, 'run_tests not called'
         assert self.starttime, 'starttime not set; have you started the tests?'
@@ -441,7 +441,7 @@ class MozMill(object):
         try:
             # Set the upload time of the report
             now = datetime.utcnow()
-            results['time_upload'] = now.strftime("%Y-%m-%dT%H:%M:%S")
+            results['time_upload'] = now.strftime("%Y-%m-%dT%H:%M:%SZ")
 
             # Parse URL fragments and send data
             url_fragments = urlparse.urlparse(report_url)
@@ -705,7 +705,7 @@ class CLI(jsbridge.CLI):
                                               help="Print logger errors to the console.")
     parser_options[("--report",)] = dict(dest="report", default=False,
                                          help="Report the results. Requires url to results server. Use 'stdout' for stdout.")
-    parser_options[("--showall",)] = dict(dest="showall", default=False, action="store_true",
+    parser_options[("--show-all",)] = dict(dest="showall", default=False, action="store_true",
                                          help="Show all test output.")
     parser_options[("--timeout",)] = dict(dest="timeout", type="float",
                                           default=60., 

testing/mozmill/mozmill/mozmill/extension/content/menus.js

@@ -146,4 +146,11 @@ function tabSelected(selector) {
   editor.switchTab(selector.selectedIndex);
 }
 
+function openHelp() {
+  var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]  
+                         .getService(Components.interfaces.nsIWindowMediator);  
+  var browser = wm.getMostRecentWindow("navigator:browser").gBrowser;
+  browser.selectedTab =
+    browser.addTab("http://quality.mozilla.org/docs/mozmill/getting-started/");
+}
 

testing/mozmill/mozmill/mozmill/extension/content/mozmill.html

@@ -53,7 +53,7 @@
 
       $('#fileMenu').menu({
         content: $('#fileMenulist').html(),
-        showSpeed: 120 
+        showSpeed: 120
       });
 	});
   </script>
@@ -75,8 +75,9 @@
               <li class="menuitem" onclick="closeFile();"><a href="#" >Close C<u>u</u>rrent File</a></li>
               <li class="menuitem" onclick="runFile();"><a href="#">Run <u>F</u>ile</a></li>
               <li class="menuitem" onclick="runDirectory();"><a href="#">Run Direc<u>t</u>ory</a></li>
-              </ul>
-            </div> 
+              <li class="menuitem" onclick="openHelp();"><a href="#"><u>H</u>elp</a></li>
+            </ul>
+          </div>
          <span id="openTabs"><span id="openTabsLabel">Open Files: </span><select id="editor-tab-select" onchange="tabSelected(this);"></select></span>
          <span style="float:right;">
           <button id="runButton"  class="ui-state-default ui-corner-all" onclick="runEditor();"><u>R</u>un</button>

testing/mozmill/mozmill/mozmill/extension/content/overlay.js

@@ -0,0 +1,86 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Corporation Code.
+ *
+ * The Initial Developer of the Original Code is
+ * Adam Christian.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Adam Christian <adam.christian@gmail.com>
+ *  Mikeal Rogers <mikeal.rogers@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var mozmillInit = {}; Components.utils.import('resource://mozmill/modules/init.js', mozmillInit);
+
+var MozMill = {
+  onLoad: function() {
+    // initialization code
+    this.initialized = true;
+  },
+
+  onMenuItemCommand: function() {
+    var utils = {}; Components.utils.import('resource://mozmill/modules/utils.js', utils);
+    var mmWindows = utils.getWindowByTitle('MozMill IDE');
+    if (!mmWindows){
+      var height = utils.getPreference("mozmill.height", 740);
+      var width = utils.getPreference("mozmill.width", 635);
+      //move to top left corner
+      var left = utils.getPreference("mozmill.screenX", 0);
+      var top = utils.getPreference("mozmill.screenY", 0);
+
+      if (left == 0){
+        //make only browser windows big
+        var width = window.screen.availWidth/2.5;
+        var height = window.screen.availHeight;
+        window.resizeTo((window.screen.availWidth - width), window.screen.availHeight);
+
+        var height = window.innerHeight;
+        var left = window.innerWidth;
+      }
+      
+      var paramString = "chrome,resizable,height=" + height +
+                               ",width=" + width + ",left="+left+",top="+top;
+      var w = window.open("chrome://mozmill/content/mozmill.xul", "", paramString);
+    } else { mmWindows[0].focus(); }
+  }
+};
+
+window.addEventListener("load", function(e) { MozMill.onLoad(e); }, false);
+
+ 
+function mozMillTestWindow() {
+  window.openDialog("chrome://mozmill/content/testwindow.html", "_blank", "chrome,dialog=no, resizable");
+}
+
+//adding a mozmill keyboard shortcut
+// window.addEventListener("keypress", function(e) { 
+//   if ((e.charCode == 109) && (e.ctrlKey)) { 
+//     MozMill.onMenuItemCommand(e); 
+//   } 
+// }, false);

testing/mozmill/mozmill/mozmill/extension/content/shortcuts.js

@@ -62,6 +62,10 @@ function onkeypress(e){
         e.preventDefault();
         runDirectory();
       break;
+      case 'h':
+        e.preventDefault();
+        openHelp();
+      break;
       case 'l':
         e.preventDefault();
         logicalClear();