Merge branch 'master' into sa-use-try-extra

src/staticanalysis/bot/static_analysis_bot/revisions.py

@@ -323,7 +323,6 @@ def as_dict(self):
         Outputs a serializable representation of this revision
         '''
         return {
-            'source': 'phabricator',
             'diff_phid': self.diff_phid,
             'phid': self.phid,
             'diff_id': self.diff_id,

src/staticanalysis/bot/static_analysis_bot/workflows/base.py

@@ -128,6 +128,11 @@ def index(self, revision, **kwargs):
         now = datetime.utcnow()
         payload['indexed'] = now.strftime(TASKCLUSTER_DATE_FORMAT)
 
+        # Always add the source and try config
+        payload['source'] = settings.source
+        payload['try_task_id'] = settings.try_task_id
+        payload['try_group_id'] = settings.try_group_id
+
         # Add a sub namespace with the task id to be able to list
         # tasks from the parent namespace
         namespaces = revision.namespaces + [

src/staticanalysis/bot/tests/conftest.py

@@ -53,7 +53,7 @@ def mock_config():
     return build_config()
 
 
-@pytest.fixture(scope='function')
+@pytest.fixture(scope='class')
 def mock_try_config():
     '''
     Mock configuration for bot

src/staticanalysis/bot/tests/test_reporter_debug.py

@@ -35,7 +35,6 @@ def test_publication(tmpdir, mock_issues, mock_phabricator):
 
     assert 'revision' in report
     assert report['revision'] == {
-        'source': 'phabricator',
         'id': 51,
         'diff_id': 42,
         'url': 'https://phabricator.test/D51',

src/staticanalysis/bot/tests/test_workflow.py

@@ -6,18 +6,18 @@
 from unittest import mock
 
 
-def test_taskcluster_index(mock_workflow, mock_config):
+def test_taskcluster_index(mock_workflow, mock_try_config):
     '''
     Test the Taskcluster indexing API
     by mocking an online taskcluster state
     '''
     from static_analysis_bot.config import TaskCluster
     from static_analysis_bot.revisions import Revision
-    mock_config.taskcluster = TaskCluster('/tmp/dummy', '12345deadbeef', 0, False)
+    mock_try_config.taskcluster = TaskCluster('/tmp/dummy', '12345deadbeef', 0, False)
     mock_workflow.index_service = mock.Mock()
     rev = Revision()
     rev.namespaces = ['mock.1234']
-    rev.as_dict = lambda: {'id': '1234', 'source': 'mock'}
+    rev.as_dict = lambda: {'id': '1234', 'someData': 'mock'}
     mock_workflow.index(rev, test='dummy')
 
     assert mock_workflow.index_service.insertTask.call_count == 2
@@ -29,7 +29,10 @@ def test_taskcluster_index(mock_workflow, mock_config):
     assert args['taskId'] == '12345deadbeef'
     assert args['data']['test'] == 'dummy'
     assert args['data']['id'] == '1234'
-    assert args['data']['source'] == 'mock'
+    assert args['data']['source'] == 'try'
+    assert args['data']['try_task_id'] == 'remoteTryTask'
+    assert args['data']['try_group_id'] == 'remoteTryGroup'
+    assert args['data']['someData'] == 'mock'
     assert 'indexed' in args['data']
 
     # Second call with sub namespace
@@ -38,5 +41,8 @@ def test_taskcluster_index(mock_workflow, mock_config):
     assert args['taskId'] == '12345deadbeef'
     assert args['data']['test'] == 'dummy'
     assert args['data']['id'] == '1234'
-    assert args['data']['source'] == 'mock'
+    assert args['data']['source'] == 'try'
+    assert args['data']['try_task_id'] == 'remoteTryTask'
+    assert args['data']['try_group_id'] == 'remoteTryGroup'
+    assert args['data']['someData'] == 'mock'
     assert 'indexed' in args['data']