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

Download candidate builds from candidates/ and not nightly/ #221

Closed
wants to merge 1 commit into from
Closed

Download candidate builds from candidates/ and not nightly/ #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion mozdownload/scraper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ def candidate_build_list_regex(self):
a candidate build."""

# Regex for possible builds for the given date
return r'nightly/%(VERSION)s-candidates/' % {
return r'candidates/%(VERSION)s-candidates/' % {
'VERSION': self.version}

@property
Expand Down
0 ...ld1/linux-i686/en-US/firefox-21.0.tar.bz2 → ...ld1/linux-i686/en-US/firefox-21.0.tar.bz2
View file
Open in desktop
File renamed without changes.
0 ...1/linux-x86_64/en-US/firefox-21.0.tar.bz2 → ...1/linux-x86_64/en-US/firefox-21.0.tar.bz2
View file
Open in desktop
File renamed without changes.
0 ...didates/build1/mac/en-US/Firefox 21.0.dmg → ...didates/build1/mac/en-US/Firefox 21.0.dmg
View file
Open in desktop
File renamed without changes.
0 ...es/build1/win32/cs/Firefox Setup 21.0.exe → ...es/build1/win32/cs/Firefox Setup 21.0.exe
View file
Open in desktop
File renamed without changes.
0 ...build1/win32/en-GB/Firefox Setup 21.0.exe → ...build1/win32/en-GB/Firefox Setup 21.0.exe
View file
Open in desktop
File renamed without changes.
0 ...build1/win32/en-US/Firefox Setup 21.0.exe → ...build1/win32/en-US/Firefox Setup 21.0.exe
View file
Open in desktop
File renamed without changes.
0 ...1/win32/en-US/Firefox Setup Stub 21.0.exe → ...1/win32/en-US/Firefox Setup Stub 21.0.exe
View file
Open in desktop
File renamed without changes.
0 ...ld3/linux-i686/en-US/firefox-21.0.tar.bz2 → ...ld3/linux-i686/en-US/firefox-21.0.tar.bz2
View file
Open in desktop
File renamed without changes.
0 ...3/linux-x86_64/en-US/firefox-21.0.tar.bz2 → ...3/linux-x86_64/en-US/firefox-21.0.tar.bz2
View file
Open in desktop
File renamed without changes.
0 ...didates/build3/mac/en-US/Firefox 21.0.dmg → ...didates/build3/mac/en-US/Firefox 21.0.dmg
View file
Open in desktop
File renamed without changes.
0 ...es/build3/win32/cs/Firefox Setup 21.0.exe → ...es/build3/win32/cs/Firefox Setup 21.0.exe
View file
Open in desktop
File renamed without changes.
0 ...build3/win32/en-GB/Firefox Setup 21.0.exe → ...build3/win32/en-GB/Firefox Setup 21.0.exe
View file
Open in desktop
File renamed without changes.
0 ...build3/win32/en-US/Firefox Setup 21.0.exe → ...build3/win32/en-US/Firefox Setup 21.0.exe
View file
Open in desktop
File renamed without changes.
0 ...3/win32/en-US/Firefox Setup Stub 21.0.exe → ...3/win32/en-US/Firefox Setup Stub 21.0.exe
View file
Open in desktop
File renamed without changes.
0 ...-i686/en-US/thunderbird-10.0.5esr.tar.bz2 → ...-i686/en-US/thunderbird-10.0.5esr.tar.bz2
View file
Open in desktop
File renamed without changes.
0 ...86_64/en-US/thunderbird-10.0.5esr.tar.bz2 → ...86_64/en-US/thunderbird-10.0.5esr.tar.bz2
View file
Open in desktop
File renamed without changes.
0 ...uild1/mac/en-US/Thunderbird 10.0.5esr.dmg → ...uild1/mac/en-US/Thunderbird 10.0.5esr.dmg
View file
Open in desktop
File renamed without changes.
0 .../win32/cs/Thunderbird Setup 10.0.5esr.exe → .../win32/cs/Thunderbird Setup 10.0.5esr.exe
View file
Open in desktop
File renamed without changes.
0 ...n32/en-GB/Thunderbird Setup 10.0.5esr.exe → ...n32/en-GB/Thunderbird Setup 10.0.5esr.exe
View file
Open in desktop
File renamed without changes.
0 ...n32/en-US/Thunderbird Setup 10.0.5esr.exe → ...n32/en-US/Thunderbird Setup 10.0.5esr.exe
View file
Open in desktop
File renamed without changes.
0 ...-i686/en-US/thunderbird-10.0.5esr.tar.bz2 → ...-i686/en-US/thunderbird-10.0.5esr.tar.bz2
View file
Open in desktop
File renamed without changes.
0 ...86_64/en-US/thunderbird-10.0.5esr.tar.bz2 → ...86_64/en-US/thunderbird-10.0.5esr.tar.bz2
View file
Open in desktop
File renamed without changes.
0 ...uild3/mac/en-US/Thunderbird 10.0.5esr.dmg → ...uild3/mac/en-US/Thunderbird 10.0.5esr.dmg
View file
Open in desktop
File renamed without changes.
0 .../win32/cs/Thunderbird Setup 10.0.5esr.exe → .../win32/cs/Thunderbird Setup 10.0.5esr.exe
View file
Open in desktop
File renamed without changes.
0 ...n32/en-GB/Thunderbird Setup 10.0.5esr.exe → ...n32/en-GB/Thunderbird Setup 10.0.5esr.exe
View file
Open in desktop
File renamed without changes.
0 ...n32/en-US/Thunderbird Setup 10.0.5esr.exe → ...n32/en-US/Thunderbird Setup 10.0.5esr.exe
View file
Open in desktop
File renamed without changes.
34 changes: 17 additions & 17 deletions tests/release_candidate_scraper/test_release_candidate_scraper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,59 +17,59 @@
{'args': {'platform': 'win32',
'version': '21.0'},
'target': 'firefox-21.0-build3.en-US.win32.exe',
'target_url': 'firefox/nightly/21.0-candidates/build3/win32/en-US/Firefox Setup 21.0.exe'},
'target_url': 'firefox/candidates/21.0-candidates/build3/win32/en-US/Firefox Setup 21.0.exe'},
# -a firefox -p linux -v 21.0
{'args': {'application': 'firefox',
'platform': 'linux',
'version': '21.0'},
'target': 'firefox-21.0-build3.en-US.linux.tar.bz2',
'target_url': 'firefox/nightly/21.0-candidates/build3/linux-i686/en-US/firefox-21.0.tar.bz2'},
'target_url': 'firefox/candidates/21.0-candidates/build3/linux-i686/en-US/firefox-21.0.tar.bz2'},
# -a firefox -p linux64 -v 21.0
{'args': {'application': 'firefox',
'platform': 'linux64',
'version': '21.0'},
'target': 'firefox-21.0-build3.en-US.linux64.tar.bz2',
'target_url': 'firefox/nightly/21.0-candidates/build3/linux-x86_64/en-US/firefox-21.0.tar.bz2'},
'target_url': 'firefox/candidates/21.0-candidates/build3/linux-x86_64/en-US/firefox-21.0.tar.bz2'},
# -a firefox -p mac -v 21.0
{'args': {'application': 'firefox',
'platform': 'mac',
'version': '21.0'},
'target': 'firefox-21.0-build3.en-US.mac.dmg',
'target_url': 'firefox/nightly/21.0-candidates/build3/mac/en-US/Firefox 21.0.dmg'},
'target_url': 'firefox/candidates/21.0-candidates/build3/mac/en-US/Firefox 21.0.dmg'},
# -a firefox -p win32 -v 21.0
{'args': {'application': 'firefox',
'platform': 'win32',
'version': '21.0'},
'target': 'firefox-21.0-build3.en-US.win32.exe',
'target_url': 'firefox/nightly/21.0-candidates/build3/win32/en-US/Firefox Setup 21.0.exe'},
'target_url': 'firefox/candidates/21.0-candidates/build3/win32/en-US/Firefox Setup 21.0.exe'},
# -a firefox -p win32 -v 21.0 -l cs
{'args': {'application': 'firefox',
'locale': 'cs',
'platform': 'win32',
'version': '21.0'},
'target': 'firefox-21.0-build3.cs.win32.exe',
'target_url': 'firefox/nightly/21.0-candidates/build3/win32/cs/Firefox Setup 21.0.exe'},
'target_url': 'firefox/candidates/21.0-candidates/build3/win32/cs/Firefox Setup 21.0.exe'},
# -a firefox -p win32 -v 21.0 -l en-GB
{'args': {'application': 'firefox',
'locale': 'en-GB',
'platform': 'win32',
'version': '21.0'},
'target': 'firefox-21.0-build3.en-GB.win32.exe',
'target_url': 'firefox/nightly/21.0-candidates/build3/win32/en-GB/Firefox Setup 21.0.exe'},
'target_url': 'firefox/candidates/21.0-candidates/build3/win32/en-GB/Firefox Setup 21.0.exe'},
# -a firefox -p win32 -v 21.0 --build-number=1
{'args': {'application': 'firefox',
'build_number': '1',
'platform': 'win32',
'version': '21.0'},
'target': 'firefox-21.0-build1.en-US.win32.exe',
'target_url': 'firefox/nightly/21.0-candidates/build1/win32/en-US/Firefox Setup 21.0.exe'},
'target_url': 'firefox/candidates/21.0-candidates/build1/win32/en-US/Firefox Setup 21.0.exe'},
# -a firefox -p win32 -v 21.0 --stub
{'args': {'application': 'firefox',
'is_stub_installer': True,
'platform': 'win32',
'version': '21.0'},
'target': 'firefox-21.0-build3.en-US.win32.exe',
'target_url': 'firefox/nightly/21.0-candidates/build3/win32/en-US/Firefox Setup Stub 21.0.exe'},
'target_url': 'firefox/candidates/21.0-candidates/build3/win32/en-US/Firefox Setup Stub 21.0.exe'},
]

thunderbird_tests = [
Expand All @@ -78,46 +78,46 @@
'platform': 'linux',
'version': '10.0.5esr'},
'target': 'thunderbird-10.0.5esr-build3.en-US.linux.tar.bz2',
'target_url': 'thunderbird/nightly/10.0.5esr-candidates/build3/linux-i686/en-US/thunderbird-10.0.5esr.tar.bz2'},
'target_url': 'thunderbird/candidates/10.0.5esr-candidates/build3/linux-i686/en-US/thunderbird-10.0.5esr.tar.bz2'},
# -a thunderbird -p linux64 -v 10.0.5esr
{'args': {'application': 'thunderbird',
'platform': 'linux64',
'version': '10.0.5esr'},
'target': 'thunderbird-10.0.5esr-build3.en-US.linux64.tar.bz2',
'target_url': 'thunderbird/nightly/10.0.5esr-candidates/build3/linux-x86_64/en-US/thunderbird-10.0.5esr.tar.bz2'},
'target_url': 'thunderbird/candidates/10.0.5esr-candidates/build3/linux-x86_64/en-US/thunderbird-10.0.5esr.tar.bz2'},
# -a thunderbird -p mac -v 10.0.5esr
{'args': {'application': 'thunderbird',
'platform': 'mac',
'version': '10.0.5esr'},
'target': 'thunderbird-10.0.5esr-build3.en-US.mac.dmg',
'target_url': 'thunderbird/nightly/10.0.5esr-candidates/build3/mac/en-US/Thunderbird 10.0.5esr.dmg'},
'target_url': 'thunderbird/candidates/10.0.5esr-candidates/build3/mac/en-US/Thunderbird 10.0.5esr.dmg'},
# -a thunderbird -p win32 -v 10.0.5esr
{'args': {'application': 'thunderbird',
'platform': 'win32',
'version': '10.0.5esr'},
'target': 'thunderbird-10.0.5esr-build3.en-US.win32.exe',
'target_url': 'thunderbird/nightly/10.0.5esr-candidates/build3/win32/en-US/Thunderbird Setup 10.0.5esr.exe'},
'target_url': 'thunderbird/candidates/10.0.5esr-candidates/build3/win32/en-US/Thunderbird Setup 10.0.5esr.exe'},
# -a thunderbird -p win32 -v 10.0.5esr -l cs
{'args': {'application': 'thunderbird',
'locale': 'cs',
'platform': 'win32',
'version': '10.0.5esr'},
'target': 'thunderbird-10.0.5esr-build3.cs.win32.exe',
'target_url': 'thunderbird/nightly/10.0.5esr-candidates/build3/win32/cs/Thunderbird Setup 10.0.5esr.exe'},
'target_url': 'thunderbird/candidates/10.0.5esr-candidates/build3/win32/cs/Thunderbird Setup 10.0.5esr.exe'},
# -a thunderbird -p win32 -v 10.0.5esr -l en-GB
{'args': {'application': 'thunderbird',
'locale': 'en-GB',
'platform': 'win32',
'version': '10.0.5esr'},
'target': 'thunderbird-10.0.5esr-build3.en-GB.win32.exe',
'target_url': 'thunderbird/nightly/10.0.5esr-candidates/build3/win32/en-GB/Thunderbird Setup 10.0.5esr.exe'},
'target_url': 'thunderbird/candidates/10.0.5esr-candidates/build3/win32/en-GB/Thunderbird Setup 10.0.5esr.exe'},
# -a thunderbird -p win32 -v 10.0.5esr
{'args': {'application': 'thunderbird',
'build_number': '1',
'platform': 'win32',
'version': '10.0.5esr'},
'target': 'thunderbird-10.0.5esr-build1.en-US.win32.exe',
'target_url': 'thunderbird/nightly/10.0.5esr-candidates/build1/win32/en-US/Thunderbird Setup 10.0.5esr.exe'},
'target_url': 'thunderbird/candidates/10.0.5esr-candidates/build1/win32/en-US/Thunderbird Setup 10.0.5esr.exe'},
]

tests = firefox_tests + thunderbird_tests
Expand All @@ -127,7 +127,7 @@ class ReleaseCandidateScraperTest(mhttpd.MozHttpdBaseTest):
"""test mozdownload scraper class"""

def test_scraper(self):
"""Testing various download scenarios for ReleaseScraper"""
"""Testing various download scenarios for ReleaseCandidateScraper"""

for entry in tests:
scraper = ReleaseCandidateScraper(directory=self.temp_dir,
Expand Down