Change name of TBPL log file to buildbot_text.

Fixes mozilla#12
davehunt · Apr 12, 2017 · 1cd9c44 · 1cd9c44
1 parent 7fb8469
commit 1cd9c44
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/tests/submitToTreeherderTest.groovy → tests/submitToTreeherderTests.groovy b/tests/submitToTreeherderTest.groovy → tests/submitToTreeherderTests.groovy
@@ -38,4 +38,26 @@ class SubmitToTreeherderTests extends BasePipelineTest {
         assert !display.containsKey('groupName')
     }
 
+    @Test
+    void getLogsReturnsListOfLinkMaps() {
+        helper.registerAllowedMethod('publishToS3', [String.class, String.class], {path, bucket ->
+            [[url:'linkURL', name:'linkName']]})
+        def script = loadScript('vars/submitToTreeherder.groovy')
+        def links = script.getLogs('foo')
+        assert links.size() == 1
+        assert links[0].url == 'linkURL'
+        assert links[0].name == 'linkName'
+    }
+
+    @Test
+    void tbplLogNameIsModified() {
+        helper.registerAllowedMethod('publishToS3', [String.class, String.class], {path, bucket ->
+            [[url:'linkURL', name:'my-tbpl-log']]})
+        def script = loadScript('vars/submitToTreeherder.groovy')
+        def links = script.getLogs('foo')
+        assert links.size() == 1
+        assert links[0].url == 'linkURL'
+        assert links[0].name == 'buildbot_text'
+    }
+
 }
diff --git a/vars/submitToTreeherder.groovy b/vars/submitToTreeherder.groovy
@@ -110,7 +110,8 @@ def getLogs(logPath) {
   if ( logPath != null ) {
     logLinks = publishToS3(logPath, 'net-mozaws-stage-fx-test-treeherder')
     for (link in logLinks) {
-      links.add([url: link.url, name: link.name])
+      name = link.name =~ 'tbpl' ? 'buildbot_text' : link.name
+      links.add([url: link.url, name: name])
     }
   }
   return links