Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 119: download files with different extension than exe #126

Closed
wants to merge 7 commits into from
Closed

Issue 119: download files with different extension than exe #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3615b54
Default win extensions regex changed
Nebelhom Aug 16, 2013
1484243
Revert regex change, add manual test for win32 zip
Nebelhom Aug 20, 2013
189983b
Fixed issue in Daily Scraper
Nebelhom Sep 24, 2013
f08ddc5
Change manual test for zip extension to txt and json
Nebelhom Oct 20, 2013
1d0fd6b
Add json test
Nebelhom Nov 17, 2013
8577b17
Add txt test, clean up manifest.ini
Nebelhom Nov 18, 2013
bb35ee9
remove json file and test, adjust .gitignore
Nebelhom Nov 18, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mozdownload/scraper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 0 additions & 7 deletions tests/test_cases.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 9 additions & 1 deletion tests/tinderbox_scraper/test_tinderbox_scraper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down