feat: make the UA format with same as other clients (#793)

KazuCocoa · web-flow · commit f304f6509796 · 2023-06-09T01:03:33.000-07:00
* chore: set version with /

* chore: update comment

* update test

* update tests
diff --git a/appium/webdriver/appium_connection.py b/appium/webdriver/appium_connection.py
@@ -24,6 +24,9 @@
     from urllib.parse import ParseResult
 
 
+PREFIX_HEADER = 'appium/'
+
+
 class AppiumConnection(RemoteConnection):
     _proxy_url: Optional[str]
 
@@ -68,7 +71,8 @@ def _get_connection_manager(self) -> Union[urllib3.PoolManager, urllib3.ProxyMan
     def get_remote_connection_headers(cls, parsed_url: 'ParseResult', keep_alive: bool = True) -> Dict[str, Any]:
         """Override get_remote_connection_headers in RemoteConnection"""
         headers = RemoteConnection.get_remote_connection_headers(parsed_url, keep_alive=keep_alive)
-        headers['User-Agent'] = f'appium/python {library_version()} ({headers["User-Agent"]})'
+        # e.g. appium/0.49 (selenium/3.141.0 (python linux))
+        headers['User-Agent'] = f'{PREFIX_HEADER}{library_version()} ({headers["User-Agent"]})'
         if parsed_url.path.endswith('/session'):
             # https://github.com/appium/appium-base-driver/pull/400
             headers['X-Idempotency-Key'] = str(uuid.uuid4())
diff --git a/test/unit/webdriver/webdriver_test.py b/test/unit/webdriver/webdriver_test.py
@@ -33,7 +33,7 @@
 )
 
 
-class TestWebDriverWebDriver(object):
+class TestWebDriverWebDriver:
     @httpretty.activate
     def test_create_session(self):
         httpretty.register_uri(
@@ -54,7 +54,7 @@ def test_create_session(self):
 
         request = httpretty.HTTPretty.latest_requests[0]
         assert request.headers['content-type'] == 'application/json;charset=UTF-8'
-        assert 'appium/python {} (selenium'.format(appium_version.version) in request.headers['user-agent']
+        assert f'appium/{appium_version.version} (selenium' in request.headers['user-agent']
 
         request_json = json.loads(httpretty.HTTPretty.latest_requests[0].body.decode('utf-8'))
         assert request_json.get('capabilities') is not None
@@ -328,7 +328,7 @@ class CustomAppiumConnection(AppiumConnection):
 
         request = httpretty.HTTPretty.latest_requests[0]
         assert request.headers['content-type'] == 'application/json;charset=UTF-8'
-        assert 'appium/python {} (selenium'.format(appium_version.version) in request.headers['user-agent']
+        assert f'appium/{appium_version.version} (selenium' in request.headers['user-agent']
 
         request_json = json.loads(httpretty.HTTPretty.latest_requests[0].body.decode('utf-8'))
         assert request_json.get('capabilities') is not None
@@ -374,7 +374,7 @@ class CustomAppiumConnection(AppiumConnection):
 
         request = httpretty.HTTPretty.latest_requests[0]
         assert request.headers['content-type'] == 'application/json;charset=UTF-8'
-        assert 'appium/python {} (selenium'.format(appium_version.version) in request.headers['user-agent']
+        assert f'appium/{appium_version.version} (selenium' in request.headers['user-agent']
 
         request_json = json.loads(httpretty.HTTPretty.latest_requests[0].body.decode('utf-8'))
         assert request_json.get('capabilities') is not None
