Allow to download files with different extensions than exe (#119)

mozilla · Nov 18, 2013 · 1ca4bbd · 1ca4bbd
1 parent 8250020
commit 1ca4bbd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/mozdownload/scraper.py b/mozdownload/scraper.py
@@ -444,8 +444,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]
 
         return regex % {'APP': self.application,

diff --git a/tests/test_cases.md b/tests/test_cases.md
@@ -12,13 +12,6 @@ mozdownload -t tinderbox -p win32
 
 ### Tinderbox
 
-```
-mozdownload -a firefox -t tinderbox -p linux --branch=mozilla-central --extension=txt
-```
-<!-- Issue #180 -->
-```
-mozdownload -a firefox -p win32 --branch=mozilla-central --stub
-```
 <!-- Issue #144 -->
 ```
 mozdownload -a firefox -p mac64 --branch=mozilla-central

diff --git a/tests/tinderbox_scraper/test_tinderbox_scraper.py b/tests/tinderbox_scraper/test_tinderbox_scraper.py
@@ -118,7 +118,15 @@
               'platform': 'win32'},
      'target': 'mozilla-inbound-firefox-25.0a1.en-US.win32.installer.exe',
      'target_url': 'firefox/tinderbox-builds/mozilla-inbound-win32/'
-                   '1374583608/firefox-25.0a1.en-US.win32.installer.exe'}
+                   '1374583608/firefox-25.0a1.en-US.win32.installer.exe'},
+    # -a firefox -t tinderbox -p linux --branch=mozilla-central --extension=txt
+    {'args': {'application': 'firefox',
+              'branch': 'mozilla-central',
+              'extension': 'txt',
+              'platform': 'linux'},
+     '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'},
 ]
 
 thunderbird_tests = [