Updates and fixes for User Agent handling

notecard/notecard.py

@@ -198,6 +198,7 @@ class Notecard:
         'os_platform': sys.platform,
         'os_version': sys.version
     }
+    _user_agent_app = None
     _user_agent_sent = False
 
     def __init__(self):
@@ -213,16 +214,21 @@ def _preprocessReq(self, req):
         """Inspect the request for hub.set and add the User Agent."""
         if 'hub.set' in req.values():
             # Merge the User Agent to send along with the hub.set request.
-            new_req = req.copy()
-            new_req.update(self.GetUserAgent())
-            req = new_req
+            req = req.copy()
+            req.update({'body': self.GetUserAgent()})
 
             self._user_agent_sent = True
         return req
 
     def GetUserAgent(self):
         """Return the User Agent String for the host for debug purposes."""
-        return self._user_agent
+        ua_copy = self._user_agent.copy()
+        ua_copy.update(self._user_agent_app or {})
+        return ua_copy
+
+    def SetAppUserAgent(self, app_user_agent):
+        """Set the User Agent info for the app."""
+        self._user_agent_app = app_user_agent
 
     def UserAgentSent(self):
         """Return true if the User Agent has been sent to the Notecard."""

test/test_notecard.py

@@ -414,3 +414,27 @@ def test_debug_mode_on_i2c(self):
         nCard = notecard.OpenI2C(port, 0x17, 255, debug=True)
 
         assert nCard._debug
+
+
+class MockNotecard(notecard.Notecard):
+    def Reset(self):
+        pass
+
+
+class TestUserAgent:
+
+    def setUserAgentInfo(self, info=None):
+        nCard = MockNotecard()
+        orgReq = {"req": "hub.set"}
+        nCard.SetAppUserAgent(info)
+        req = nCard._preprocessReq(orgReq)
+        return req
+
+    def test_amends_hub_set_request(self):
+        req = self.setUserAgentInfo()
+        assert req['body'] is not None
+
+    def test_adds_app_info(self):
+        info = {"app": "myapp"}
+        req = self.setUserAgentInfo(info)
+        assert req['body']['app'] == 'myapp'