Bug 548172 - avoid gratuitous error message in non-VNC case per sid0
authorAndrew Sutherland <asutherland@asutherland.org>
Wed, 17 Mar 2010 11:42:36 -0700
changeset 5200 d46ad9748f3f02ceaaeeac24fe1eb99cbde99473
parent 5199 cef0f15b47182dd85ac7a1aecd333c2de5b82e67
child 5201 8a5ef0bf15708f9bf48a38a496e0dd0537f0fabd
push idunknown
push userunknown
push dateunknown
bugs548172
Bug 548172 - avoid gratuitous error message in non-VNC case per sid0
mail/test/mozmill/runtest.py
--- a/mail/test/mozmill/runtest.py
+++ b/mail/test/mozmill/runtest.py
@@ -221,17 +221,17 @@ class ThunderTestRunner(mozrunner.Thunde
         the keyboard interrupt case wait will die due to the interrupt and
         stop/kill will be killed.  Since we are wrapping wait, we don't need
         to specialize for stop/kill though.
         '''
         try:
             return mozrunner.ThunderbirdRunner.wait(self, timeout)
         finally:
             try:
-                if self.vnc_alive:
+                if self.use_vnc_server and self.vnc_alive:
                     subprocess.check_call([self.VNC_SERVER_PATH,
                                            '-kill', ':99'])
             except Exception, ex:
                 print '!!! Exception during killing VNC server:', ex
 
 
 class ThunderTestCLI(mozmill.CLI):