updated whitespaces and formatting based on review draft
authorJosh Grant <joshua.m.grant@gmail.com>
Wed, 28 Jan 2015 20:21:19 -0500
changeset 239708 4a4eeb9f71b946a6f249c6992f3ffe2cfd459e78
parent 239707 a3d01ad1e246411e14c63f1a9bbf2ec1e3945d02
child 239709 b310f26ba2732c1b8699d90c2bd3b539bcf6c08f
push id500
push userjoshua.m.grant@gmail.com
push dateThu, 29 Jan 2015 01:48:36 +0000
milestone38.0a1
updated whitespaces and formatting based on review
testing/marionette/client/marionette/marionette.py
--- a/testing/marionette/client/marionette/marionette.py
+++ b/testing/marionette/client/marionette/marionette.py
@@ -1132,28 +1132,25 @@ class Marionette(object):
         """
 
         response = self._send_message("get", "ok", url=url)
         return response
 
     def timeouts(self, timeout_type, ms):
         """An interface for managing timeout behaviour of a Marionette instance. 
 
-        Setting timeouts specifies the type and amount of time the Marionette instance should wait during requests. 
+        Setting timeouts specifies the type and amount of time the Marionette instance should wait during requests.
 
-        There are three types of timeouts that can be set: implicit, script and page load. 
+        There are three types of timeouts that can be set: implicit, script and page load.
 
-        An implicit  timeout specifies the amount of time a Marionette instance should wait when searching for elements. Here, marionette 
-        polls a page until an element is found or the timeout expires, whichever occurs first. 
+        * An implicit  timeout specifies the amount of time a Marionette instance should wait when searching for elements. Here, marionette polls a page until an element is found or the timeout expires, whichever occurs first.
+        * A script timeout specifies the amount of time the Marionette instance should wait when scripts (Ajax, jQuery, etc) are loading on the page.
+        * A page load timeout specifies the amount of time the Marionette instance should wait for a page load operation to complete.
 
-        A script timeout specifies the amount of time the Marionette instance should wait when scripts (Ajax, jQuery, etc) are loading on the page.
-
-        A page load timeout specifies the amount of time the Marionette instance should wait for a page load operation to complete. 
-
-        :param timeout_type: A string value specifying the timeout type. This must be one of three types: 'implicit', 'script' or 'page load'
+        :param timeout_type: A string value specifying the timeout type. This must be one of three types: 'implicit', 'script' or 'page looad'
         :param ms: A number value specifying the timeout length in milliseconds (ms)
         """
         assert(timeout_type == self.TIMEOUT_SEARCH or timeout_type == self.TIMEOUT_SCRIPT or timeout_type == self.TIMEOUT_PAGE)
         response = self._send_message('timeouts', 'ok', type=timeout_type, ms=ms)
         return response
 
     def go_back(self):
         '''