From 4fce85023b15be572688aa66414294b4c99db63f Mon Sep 17 00:00:00 2001
From: Andreas Tolfsen <ato@mozilla.com>
Date: Thu, 23 Feb 2017 18:12:00 +0000
Subject: [PATCH] client: align webdriver.Timeouts with spec

The existing `webdriver.Timeouts` implementation was written before
the specification has a _Get Timeouts_ command. This aligns it with the
specification and makes use of the new command so that timeout duration
values are no longer cached internally.
---
 webdriver/client.py | 52 +++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/webdriver/client.py b/webdriver/client.py
index 2295ee05199545..42e2f583fbf5bd 100644
--- a/webdriver/client.py
+++ b/webdriver/client.py
@@ -31,43 +31,49 @@ def inner(self, *args, **kwargs):
 
 
 class Timeouts(object):
+
     def __init__(self, session):
         self.session = session
-        self._script = 30
-        self._load = 0
-        self._implicit_wait = 0
 
-    def _set_timeouts(self, name, value):
-        body = {"type": name,
-                "ms": value * 1000}
-        return self.session.send_command("POST", "timeouts", body)
+    def _get(self, key=None):
+        timeouts = self.session.send_command("GET", "timeouts")
+        if key is not None:
+            return timeouts[key]
+        return timeouts
+
+    def _set(self, key, secs):
+        body = {key: secs * 1000}
+        timeouts = self.session.send_command("POST", "timeouts", body)
+        return timeouts[key]
 
     @property
     def script(self):
-        return self._script
+        return self._get("script")
 
     @script.setter
-    def script(self, value):
-        self._set_timeouts("script", value)
-        self._script = value
+    def script(self, secs):
+        return self._set("script", secs)
 
     @property
-    def load(self):
-        return self._load
+    def page_load(self):
+        return self._get("pageLoad")
 
-    @load.setter
-    def set_load(self, value):
-        self._set_timeouts("page load", value)
-        self._script = value
+    @page_load.setter
+    def page_load(self, secs):
+        return self._set("pageLoad", secs)
 
     @property
-    def implicit_wait(self):
-        return self._implicit_wait
+    def implicit(self):
+        return self._get("implicit")
+
+    @implicit.setter
+    def implicit(self, secs):
+        return self._set("implicit", secs)
 
-    @implicit_wait.setter
-    def implicit_wait(self, value):
-        self._set_timeouts("implicit wait", value)
-        self._implicit_wait = value
+    def __str__(self):
+        name = "%s.%s" % (self.__module__, self.__class__.__name__)
+        return "<%s script=%d, load=%d, implicit=%d>" % \
+            (name, self.script, self.page_load, self.implicit)
 
 
 class ActionSequence(object):