Bug 771554 - Update mozbase deps to match in-tree versions, r=jgriffin, DONTBUILD because NPOTB
authorSam Garrett <samdgarrett@gmail.com>
Mon, 06 Aug 2012 17:44:51 -0600
changeset 107119 602c2e7ee0d2b68ca5e86b6085ceb1cd4b54536a
parent 107118 e55638d4037a439147a5630bd5962ddafcd4a51b
child 107124 2dfbe4b9403b18b3aeaa4af3644c11895fd827a3
push id1490
push userakeybl@mozilla.com
push dateMon, 08 Oct 2012 18:29:50 +0000
treeherdermozilla-beta@f335e7dacdc1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgriffin, DONTBUILD
bugs771554
milestone17.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 771554 - Update mozbase deps to match in-tree versions, r=jgriffin, DONTBUILD because NPOTB
testing/tps/setup.py
testing/tps/tps/__init__.py
testing/tps/tps/cli.py
testing/tps/tps/pulse.py
--- a/testing/tps/setup.py
+++ b/testing/tps/setup.py
@@ -1,40 +1,36 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import sys
 from setuptools import setup, find_packages
 
-version = '0.2.40'
+version = '0.3'
 
-deps = ['pulsebuildmonitor >= 0.62', 'MozillaPulse == 0.61', 
-        'mozinfo == 0.3.1', 'mozprofile == 0.1t',
-        'mozprocess == 0.1a', 'mozrunner == 3.0a', 'mozregression == 0.3',
-        'mozautolog >= 0.2.1', 'mozautoeslib == 0.1.1']
+deps = ['mozinfo == 0.3.3', 'mozprofile == 0.4',
+        'mozprocess == 0.4', 'mozrunner == 5.8', 'mozregression == 0.6.3',
+        'mozautolog == 0.2.4', 'mozautoeslib == 0.1.1']
 
 # we only support python 2.6+ right now
 assert sys.version_info[0] == 2
 assert sys.version_info[1] >= 6
 
 setup(name='tps',
       version=version,
       description='run automated multi-profile sync tests',
       long_description="""\
 """,
       classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
       keywords='',
       author='Jonathan Griffin',
       author_email='jgriffin@mozilla.com',
       url='http://hg.mozilla.org/services/services-central',
       license='MPL',
-      dependency_links = [
-         "http://people.mozilla.org/~jgriffin/packages/"
-      ],
       packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
       include_package_data=True,
       zip_safe=False,
       install_requires=deps,
       entry_points="""
       # -*- Entry points: -*-
       [console_scripts]
       runtps = tps.cli:main
--- a/testing/tps/tps/__init__.py
+++ b/testing/tps/tps/__init__.py
@@ -1,9 +1,8 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from firefoxrunner import TPSFirefoxRunner
-from pulse import TPSPulseMonitor
 from testrunner import TPSTestRunner
 from mozhttpd import MozHttpd
 
--- a/testing/tps/tps/cli.py
+++ b/testing/tps/tps/cli.py
@@ -7,17 +7,17 @@ import logging
 import optparse
 import os
 import sys
 import time
 import traceback
 
 from threading import RLock
 
-from tps import TPSFirefoxRunner, TPSPulseMonitor, TPSTestRunner
+from tps import TPSFirefoxRunner, TPSTestRunner
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option("--email-results",
                     action = "store_true", dest = "emailresults",
                     default = False,
                     help = "email the test results to the recipients defined "
                            "in the config file")
deleted file mode 100644
--- a/testing/tps/tps/pulse.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-import json
-import logging
-import socket
-
-from pulsebuildmonitor import PulseBuildMonitor
-
-from tps.thread import TPSTestThread
-
-class TPSPulseMonitor(PulseBuildMonitor):
-  """Listens to pulse messages, and initiates a TPS test run when
-     a relevant 'build complete' message is received.
-  """
-
-  def __init__(self, extensionDir, platform='linux', config=None,
-               autolog=False, emailresults=False, testfile=None,
-               logfile=None, rlock=None, **kwargs):
-    self.buildtype = ['opt']
-    self.autolog = autolog
-    self.emailresults = emailresults
-    self.testfile = testfile
-    self.logfile = logfile
-    self.rlock = rlock
-    self.extensionDir = extensionDir
-    self.config = config
-    self.tree = self.config.get('tree', ['services-central'])
-    self.platform = [self.config.get('platform', 'linux')]
-    self.label=('crossweave@mozilla.com|tps_build_monitor_' +
-                socket.gethostname())
-
-    self.logger = logging.getLogger('tps_pulse')
-    self.logger.setLevel(logging.DEBUG)
-    handler = logging.FileHandler('tps_pulse.log')
-    self.logger.addHandler(handler)
-
-    PulseBuildMonitor.__init__(self,
-                               trees=self.tree,
-                               label=self.label,
-                               logger=self.logger,
-                               platforms=self.platform,
-                               buildtypes=self.buildtype,
-                               builds=True,
-                               **kwargs)
-
-  def onPulseMessage(self, data):
-    key = data['_meta']['routing_key']
-    #print key
-
-  def onBuildComplete(self, builddata):
-    print "================================================================="
-    print json.dumps(builddata)
-    print "================================================================="
-
-    thread = TPSTestThread(self.extensionDir,
-                           builddata=builddata,
-                           emailresults=self.emailresults,
-                           autolog=self.autolog,
-                           testfile=self.testfile,
-                           logfile=self.logfile,
-                           rlock=self.rlock,
-                           config=self.config)
-    thread.daemon = True
-    thread.start()