Bug 565268 - Disable vncserver logic if MOZMILL_NO_VNC is set in the environment. p=jhopkins,r=Standard8,r=gozer
authorPhilippe M. Chiasson <gozer@mozillamessaging.com>
Wed, 16 Jun 2010 16:36:54 -0400
changeset 5833 386df12e1a8063c283fd05dc71bd6af94466aa04
parent 5832 9a29b14426d9faa89544ae2a0c83739443c98dc8
child 5834 c87b25ead9e538929663d86ed9886ece690e93ff
push idunknown
push userunknown
push dateunknown
reviewersStandard8, gozer
bugs565268
Bug 565268 - Disable vncserver logic if MOZMILL_NO_VNC is set in the environment. p=jhopkins,r=Standard8,r=gozer
mail/test/mozmill/runtest.py
--- a/mail/test/mozmill/runtest.py
+++ b/mail/test/mozmill/runtest.py
@@ -218,17 +218,18 @@ class ThunderTestRunner(mozrunner.Thunde
         # do not reuse an existing instance
         env['MOZ_NO_REMOTE'] = '1'
 
         # Only use the VNC server if the capability is available and a password
         # is already defined so this can run without prompting the user.
         self.use_vnc_server = (
             platform.system() == 'Linux' and
             os.path.isfile(self.VNC_SERVER_PATH) and
-            os.path.isfile(os.path.expanduser(self.VNC_PASSWD_PATH)))
+            os.path.isfile(os.path.expanduser(self.VNC_PASSWD_PATH)) and
+            env.get('MOZMILL_NO_VNC') != '1')
 
         mozrunner.Runner.__init__(self, *args, **kwargs)
 
     def find_binary(self):
         return self.profile.app_path
 
     def start(self):
         if self.use_vnc_server: