For #24681 update to work with sudo_as

kbehrman · kbehrman · commit d30b894e7fa6 · 2014-05-28T09:26:56.000-07:00
diff --git a/shotgun_api3/shotgun.py b/shotgun_api3/shotgun.py
@@ -1438,6 +1438,10 @@ def authenticate_human_user(self, user_login, user_password):
     def update_project_last_accessed(self, project, user=None):
         """
         Update projects last_accessed_by_current_user field.
+        
+        :param project - a project entity hash
+        :param user - A human user entity hash. Optional if either login or sudo_as are used.
+
         """
         if self.server_caps.version and self.server_caps.version < (5, 3, 17):
                 raise ShotgunError("update_project_last_accessed requires server version 5.3.17 or "\
@@ -1454,11 +1458,14 @@ def update_project_last_accessed(self, project, user=None):
             raise RuntimeError("Unable to find page for project %s" % str(project))
 
         if not user:
+            # Try to use sudo as user if present
+            if self.config.sudo_as_login:
+                user = self.find_one('HumanUser', [['login', 'is', self.config.sudo_as_login]])
             # Try to use login if present
             if self.config.user_login:
                 user = self.find_one('HumanUser', [['login', 'is', self.config.user_login]])
         if not user:
-            raise RuntimeError("No user supplied and unable to determine user from login")
+            raise RuntimeError("No user supplied and unable to determine user from login or sudo_as")
 
         self.create( 'PageHit', { 'page': page, 'user': user } )
 
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -1584,10 +1584,10 @@ def test_pass_in_user(self):
         if self.sg.server_caps.version and self.sg.server_caps.version < (5, 3, 17):
             return
 
-        sg = shotgun_api3.Shotgun(self.config.server_url,
-                    login=self.config.human_login,
-                    password=self.config.human_password,
-                    http_proxy=self.config.http_proxy)
+        sg = shotgun_api3.Shotgun( self.config.server_url,
+                                   login=self.config.human_login,
+                                   password=self.config.human_password,
+                                   http_proxy=self.config.http_proxy )
  
         initial = sg.find_one('Project', [['id','is',self.project['id']]], ['last_accessed_by_current_user'])
 
@@ -1600,6 +1600,25 @@ def test_pass_in_user(self):
         if initial:
             assert(initial['last_accessed_by_current_user'] < current['last_accessed_by_current_user'])
 
+    def test_sudo_as_user(self):
+        if self.sg.server_caps.version and self.sg.server_caps.version < (5, 3, 17):
+            return
+
+        sg = shotgun_api3.Shotgun( self.config.server_url,
+                                   self.config.script_name,
+                                   self.config.api_key,
+                                   http_proxy=self.config.http_proxy,
+                                   sudo_as_login=self.config.human_login )
+
+        initial = sg.find_one('Project', [['id','is',self.project['id']]], ['last_accessed_by_current_user'])
+
+        sg.update_project_last_accessed(self.project)
+
+        current =  sg.find_one('Project', [['id','is',self.project['id']]], ['last_accessed_by_current_user'])
+        self.assertNotEqual( initial, current )
+        # it's possible initial is None
+        if initial:
+            assert(initial['last_accessed_by_current_user'] < current['last_accessed_by_current_user'])
 
 def  _has_unicode(data):
     for k, v in data.items():
