640355 - extraneous check and raise for disconnect in MozMill

Status: RESOLVED FIXED

(Testing Graveyard :: Mozmill, defect)

Description

[Jeff Hammel]

run_tests looks for a disconnect and raises it if there is not a user
shutdown.  However, it also raises it even if there is a user
shutdown, breaking test_usershutdown.js and probably all user shutdown stuff:

def run(self, tests):
        """run the tests"""

        disconnected = False
        try:
            self.run_tests(tests)
        except JSBridgeDisconnectError:
            disconnected = True
            if not self.userShutdownEnabled:
                self.report_disconnect()
                raise
            
        if disconnected:
            # raise the disconnect error
            raise

``disconnected`` and its associated if clause needs to go

Comment 1

[Jeff Hammel]

Attachment: this at least fixes test_usershutdown.js

Comment 2

[Andrew Halberstadt [:ahal]]

Comment on attachment 518191 [details] [diff] [review]
this at least fixes test_usershutdown.js

There seems to be a problem with the mozmill/test/restart/test_user_restart/ test but I'm pretty sure that is a problem with the test itself (it hasn't been updated since the summer).

In regards to this bug "extraneous check and raise" this patch looks good and also fixes test_userShutdown.js

Comment 3

[Jeff Hammel]

pushed to master: https://github.com/mozautomation/mozmill/commit/a2af26231a8bbd0023c63c554166bfbbcb1f1d23