Merge branch 'release/2.31.0'

Author: vmalloc

backslash/client.py

@@ -45,6 +45,7 @@ def report_session_start(self, logical_id=NOTHING,
                              keepalive_interval=NOTHING,
                              subjects=NOTHING,
                              infrastructure=NOTHING,
+                             ttl_seconds=NOTHING,
     ):
         """Reports a new session starting
 
@@ -59,6 +60,7 @@ def report_session_start(self, logical_id=NOTHING,
             'keepalive_interval': keepalive_interval,
             'subjects': subjects,
             'infrastructure': infrastructure,
+            'ttl_seconds': ttl_seconds,
         }
         if parent_logical_id is not None or is_parent_session:
             supports_parallel = (self.api.info().endpoints.report_session_start.version >= 2)

backslash/contrib/slash_plugin.py

@@ -111,6 +111,11 @@ def get_name(self):
 
     def get_config(self):
         return {
+            "session_ttl_days": 0 // Doc(
+                'Optional number of days after which this session will be discarded '
+                'from Backslash') // Cmdline(arg='--session-ttl-days', metavar='DAYS'),
+
+
             "session_labels": [] // Doc('Specify labels to be added to the session when reported') \
                                  // Cmdline(append="--session-label", metavar="LABEL"),
         }
@@ -181,7 +186,11 @@ def _get_initial_session_metadata(self):
         return returned
 
     def _get_extra_session_start_kwargs(self):
-        return {}
+        returned = {}
+        ttl_seconds = slash_config.root.plugin_config.backslash.session_ttl_days * 24 * 60 * 60
+        if ttl_seconds:
+            returned['ttl_seconds'] = ttl_seconds
+        return returned
 
     @slash.plugins.register_if(_HAS_TEST_AVOIDED)
     @handle_exceptions
@@ -332,6 +341,11 @@ def _update_scm_info(self, test_info):
                 hexsha = None
             test_info['scm_revision'] = hexsha
             test_info['scm_dirty'] = bool(repo.untracked_files or repo.index.diff(None) or repo.index.diff(repo.head.commit))
+            if self.client.api.info().endpoints.report_test_start.version >= 3:
+                test_info['scm_local_branch'] = repo.active_branch.name
+                tracking_branch = repo.active_branch.tracking_branch()
+                if tracking_branch is not None:
+                    test_info['scm_remote_branch'] = tracking_branch.name
         except Exception: # pylint: disable=broad-except
             _logger.warning('Error when obtaining SCM information', exc_info=True)
 

backslash/session.py

@@ -27,8 +27,9 @@ def send_keepalive(self):
         self.client.api.call_function('send_keepalive', {'session_id': self.id})
 
     def report_test_start(self, name, file_name=NOTHING, class_name=NOTHING, test_logical_id=NOTHING, scm=NOTHING,
-                          file_hash=NOTHING, scm_revision=NOTHING, scm_dirty=NOTHING, is_interactive=NOTHING,
-                          variation=NOTHING, metadata=NOTHING, test_index=NOTHING, parameters=NOTHING):
+                          file_hash=NOTHING,
+                          scm_revision=NOTHING, scm_dirty=NOTHING, scm_local_branch=NOTHING, scm_remote_branch=NOTHING,
+                          is_interactive=NOTHING, variation=NOTHING, metadata=NOTHING, test_index=NOTHING, parameters=NOTHING):
 
         params = {
             'session_id': self.id,
@@ -37,6 +38,8 @@ def report_test_start(self, name, file_name=NOTHING, class_name=NOTHING, test_lo
             'file_hash': file_hash,
             'scm_revision': scm_revision,
             'scm_dirty': scm_dirty,
+            'scm_local_branch': scm_local_branch,
+            'scm_remote_branch': scm_remote_branch,
             'class_name': class_name,
             'file_name': file_name,
             'is_interactive': is_interactive,

docs/changelog.rst

@@ -1,7 +1,10 @@
 Changelog
 =========
 
-* :release: `2.30.0 <8-8-2017>`
+* :release:`2.31.0 <10-9-2017>`
+* :feature:`52` Support reporting sessions with a specific TTL, marking them for future deletion on the server
+* :feature:`51` Report local and remote SCM branches if supported
+* :release:`2.30.0 <8-8-2017>`
 * :feature:`50` Added session_webapp_url property to the Slash plugin
 * :release:`2.29.0 <6-8-2017>`
 * :feature:`49` Add hook for intercepting keepalive thread exceptions