Bug 811175 - Don't install mozbase packages from github, r=whimboo
authorJonathan Griffin <jgriffin@mozilla.com>
Mon, 12 Nov 2012 18:39:12 -0800
changeset 113054 039875aeaf2b4d6c7096a38eec630e5b6f2b74c5
parent 113053 0e05ac6ac23d0d71ecdd304c3bb0300e13a3d734
child 113055 cd854e9fe7c1261507c8c0de712bdddbdb1898f4
push id23848
push useremorley@mozilla.com
push dateTue, 13 Nov 2012 16:29:34 +0000
treeherdermozilla-central@d56d537a1843 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswhimboo
bugs811175
milestone19.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 811175 - Don't install mozbase packages from github, r=whimboo
testing/marionette/client/marionette/runtests.py
testing/marionette/client/marionette/venv_test.sh
--- a/testing/marionette/client/marionette/runtests.py
+++ b/testing/marionette/client/marionette/runtests.py
@@ -12,25 +12,18 @@ import types
 import unittest
 import socket
 import sys
 import time
 import platform
 import weakref
 import xml.dom.minidom as dom
 
-try:
-    from manifestparser import TestManifest
-    from mozhttpd import iface, MozHttpd
-except ImportError:
-    print "manifestparser or mozhttpd not found!  Please install mozbase:\n"
-    print "\tgit clone git://github.com/mozilla/mozbase.git"
-    print "\tpython setup_development.py\n"
-    import sys
-    sys.exit(1)
+from manifestparser import TestManifest
+from mozhttpd import iface, MozHttpd
 
 from marionette import Marionette
 from marionette_test import MarionetteJSTestCase, MarionetteTestCase
 
 
 class MarionetteTestResult(unittest._TextTestResult):
 
     def __init__(self, *args, **kwargs):
--- a/testing/marionette/client/marionette/venv_test.sh
+++ b/testing/marionette/client/marionette/venv_test.sh
@@ -28,26 +28,21 @@ then
 else
     VENV_DIR="$GECKO_OBJDIR/$VENV_DIR"
 fi
 
 # Check if environment exists, if not, create a virtualenv:
 if [ -d $VENV_DIR ]
 then
   echo "Using virtual environment in $VENV_DIR"
-  . $VENV_DIR/bin/activate
 else
   echo "Creating a virtual environment in $VENV_DIR"
   curl https://raw.github.com/pypa/virtualenv/develop/virtualenv.py | ${PYTHON} - $VENV_DIR
-  . $VENV_DIR/bin/activate
-
-  # set up mozbase
-  git clone git://github.com/mozilla/mozbase.git $VENV_DIR/mozbase
-  python $VENV_DIR/mozbase/setup_development.py
 fi
+. $VENV_DIR/bin/activate
 
 # Updating the marionette_client needs us to change into its package folder.
 # Otherwise the call to setup.py will hang
 cd $MARIONETTE_HOME
 python setup.py develop
 cd $CWD
 
 # pop off the python parameter