Adjustment in Client constructor to allow for better mocking during testing.

Author: Emanuel Winblad

README.md

@@ -77,4 +77,14 @@ except vilfo.exceptions.AuthenticationException:
 
 The `vilfo-api-client` library defines a set of exceptions that can be used to handle errors. These exception classes are located under `vilfo.exceptions`.
 
-*Additional information about the exceptions will be added and exception and error handling will be improved further.*
+*Additional information about the exceptions will be added and exception and error handling will be improved further.*
+
+## Changelog
+
+### Version 0.3.1
+
+Minor adjustment in Client constructor to allow for better mocking during testing.
+
+### Version 0.3
+
+Initial stable release.

vilfo/client.py

@@ -25,9 +25,10 @@ def __init__(self, host, token, ssl=False):
         # MAC address not resolved yet
         self.mac = None
         self._mac_resolution_failed = False
+        self._cached_mac = None
 
         try:
-            self.resolve_mac_address()
+            self.mac = self.resolve_mac_address()
         except vilfo.exceptions.VilfoException:
             pass
 
@@ -64,8 +65,8 @@ def resolve_mac_address(self, force_retry=False):
         Raises:
             - vilfo.exception.VilfoException: if the resolution failed
         """
-        if (self.mac or self._mac_resolution_failed) and not force_retry:
-            return self.mac
+        if (self._cached_mac or self._mac_resolution_failed) and not force_retry:
+            return self._cached_mac
 
         resolved_mac = None
         host_is_hostname = False
@@ -94,7 +95,7 @@ def resolve_mac_address(self, force_retry=False):
             raise vilfo.exceptions.VilfoException
 
         self._mac_resolution_failed = False
-        self.mac = resolved_mac
+        self._cached_mac = resolved_mac
 
         return resolved_mac