Allow download of files with specified extension for Tinderbox builds…

… on Windows (#264)
mozilla · Mar 4, 2015 · d4774bf · d4774bf
1 parent 942d972
commit d4774bf
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/mozdownload/scraper.py b/mozdownload/scraper.py
@@ -796,8 +796,8 @@ def binary_regex(self):
                         'linux64': r'.*\.%(EXT)s$',
                         'mac': r'.*\.%(EXT)s$',
                         'mac64': r'.*\.%(EXT)s$',
-                        'win32': r'.*(\.installer%(STUB)s)\.%(EXT)s$',
-                        'win64': r'.*(\.installer%(STUB)s)\.%(EXT)s$'}
+                        'win32': r'(\.installer%(STUB)s)?\.%(EXT)s$',
+                        'win64': r'(\.installer%(STUB)s)?\.%(EXT)s$'}
 
         regex = regex_base_name + regex_suffix[self.platform]
 

diff --git a/...firefox/tinderbox-builds/mozilla-central-macosx64/1374568307/firefox-25.0a1.en-US.mac.txt b/...firefox/tinderbox-builds/mozilla-central-macosx64/1374568307/firefox-25.0a1.en-US.mac.txt
@@ -0,0 +1,2 @@
+20150302030204
+https://hg.mozilla.org/mozilla-central/rev/eea6188b9b05
diff --git a/.../firefox/tinderbox-builds/mozilla-central-win32/1374568307/firefox-25.0a1.en-US.win32.txt b/.../firefox/tinderbox-builds/mozilla-central-win32/1374568307/firefox-25.0a1.en-US.win32.txt
@@ -0,0 +1,2 @@
+20150302121431
+https://hg.mozilla.org/mozilla-central/rev/abb7f0d180da
diff --git a/tests/tinderbox_scraper/test_tinderbox_scraper.py b/tests/tinderbox_scraper/test_tinderbox_scraper.py
@@ -142,6 +142,20 @@
      'target': 'mozilla-central-firefox-25.0a1.en-US.linux-i686.txt',
      'target_url': 'firefox/tinderbox-builds/mozilla-central-linux/'
                    '1374583608/firefox-25.0a1.en-US.linux-i686.txt'},
+    # -a firefox -t tinderbox -p win32 --extension=txt
+    {'args': {'application': 'firefox',
+              'extension': 'txt',
+              'platform': 'win32'},
+     'target': 'mozilla-central-firefox-25.0a1.en-US.win32.txt',
+     'target_url': 'firefox/tinderbox-builds/mozilla-central-win32/'
+                   '1374568307/firefox-25.0a1.en-US.win32.txt'},
+    # -a firefox -t tinderbox -p mac --extension=txt
+    {'args': {'application': 'firefox',
+              'extension': 'txt',
+              'platform': 'mac'},
+     'target': 'mozilla-central-firefox-25.0a1.en-US.mac.txt',
+     'target_url': 'firefox/tinderbox-builds/mozilla-central-macosx64/'
+                   '1374568307/firefox-25.0a1.en-US.mac.txt'},
 ]
 
 thunderbird_tests = [