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

Added date to tinderbox filename when human readable date supplied (#181) #411

Merged
merged 7 commits into from Sep 26, 2017
Merged

Added date to tinderbox filename when human readable date supplied (#181) #411

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
c8078be
Added date to tinderbox filename when human readable date supplied (#…
Nebelhom Oct 2, 2016
0f2eba0
Define self.timestamp when self.builds exists
Nebelhom Nov 17, 2016
7402ab4
Add self.builds to TinderboxScraper, adjust conditional to check for …
Nebelhom Aug 22, 2017
7d8cb2a
Revert last changes
Nebelhom Sep 15, 2017
7bdceea
Move timestamp assignment to get_build_info
Nebelhom Sep 22, 2017
8942edf
Add comment for clarification
Nebelhom Sep 22, 2017
8c8537a
Adjust comment
Nebelhom Sep 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions mozdownload/scraper.py
View file
Open in desktop
Expand Up @@ -800,6 +800,8 @@ def get_build_info(self):
if not self.locale_build:
self.builds, self.build_index = self.get_build_info_for_index(
self.build_index)
# Always force a timestamp prefix in the filename
self.timestamp = self.builds[self.build_index]

@property
def binary_regex(self):
Expand All @@ -823,6 +825,7 @@ def binary_regex(self):

def build_filename(self, binary):
"""Return the proposed filename with extension for the binary."""

return '%(TIMESTAMP)s%(BRANCH)s%(DEBUG)s-%(NAME)s' % {
'TIMESTAMP': self.timestamp + '-' if self.timestamp else '',
'BRANCH': self.branch,
Expand Down
2 changes: 1 addition & 1 deletion tests/cli/test_correct_scraper.py
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@

'tinderbox': {
'args': ['-t', 'tinderbox', '-p', 'win32'],
'fname': 'mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
'fname': '1374583608-mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
},

'try': {
Expand Down
2 changes: 1 addition & 1 deletion tests/factory/test_factory_invalid_options.py
View file
Open in desktop
Expand Up @@ -62,7 +62,7 @@
# TinderboxScraper
{
'scraper_type': 'tinderbox',
'fname': 'mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
'fname': '1374583608-mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
'kwargs': {
'platform': 'win32',

Expand Down
2 changes: 1 addition & 1 deletion tests/factory/test_factory_scraper.py
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@
# TinderboxScraper
{
'scraper_type': 'tinderbox',
'fname': 'mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
'fname': '1374583608-mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
'kwargs': {
'platform': 'win32',
},
Expand Down
50 changes: 25 additions & 25 deletions tests/tinderbox_scraper/test_tinderbox_scraper.py
View file
Open in desktop
Expand Up @@ -17,19 +17,19 @@
firefox_tests = [
# -p win32
{'args': {'platform': 'win32'},
'filename': 'mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
'filename': '1374583608-mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
'url': 'firefox/tinderbox-builds/mozilla-central-win32/'
'1374583608/firefox-25.0a1.en-US.win32.installer.exe'},
# -p win32 --branch=mozilla-central
{'args': {'branch': 'mozilla-central',
'platform': 'win32'},
'filename': 'mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
'filename': '1374583608-mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
'url': 'firefox/tinderbox-builds/mozilla-central-win32/'
'1374583608/firefox-25.0a1.en-US.win32.installer.exe'},
# -a firefox -p win32
{'args': {'application': 'firefox',
'platform': 'win32'},
'filename': 'mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
'filename': '1374583608-mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
'url': 'firefox/tinderbox-builds/mozilla-central-win32/'
'1374583608/firefox-25.0a1.en-US.win32.installer.exe'},
# -a firefox -p win32 --date 1374573725 --stub (old format)
Expand All @@ -51,50 +51,50 @@
# -a firefox -p linux --branch=mozilla-central
{'args': {'branch': 'mozilla-central',
'platform': 'linux'},
'filename': 'mozilla-central-firefox-25.0a1.en-US.linux-i686.tar.bz2',
'filename': '1374583608-mozilla-central-firefox-25.0a1.en-US.linux-i686.tar.bz2',
'url': 'firefox/tinderbox-builds/mozilla-central-linux/'
'1374583608/firefox-25.0a1.en-US.linux-i686.tar.bz2'},
# -a firefox -p linux64 --branch=mozilla-central
{'args': {'branch': 'mozilla-central',
'platform': 'linux64'},
'filename': 'mozilla-central-firefox-25.0a1.en-US.linux-x86_64.tar.bz2',
'filename': '1374583608-mozilla-central-firefox-25.0a1.en-US.linux-x86_64.tar.bz2',
'url': 'firefox/tinderbox-builds/mozilla-central-linux64/'
'1374583608/firefox-25.0a1.en-US.linux-x86_64.tar.bz2'},
# -a firefox -p win32 --branch=mozilla-central
{'args': {'application': 'firefox',
'branch': 'mozilla-central',
'platform': 'win32'},
'filename': 'mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
'filename': '1374583608-mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
'url': 'firefox/tinderbox-builds/mozilla-central-win32/'
'1374583608/firefox-25.0a1.en-US.win32.installer.exe'},
# -a firefox -p win64 --branch=mozilla-central
{'args': {'application': 'firefox',
'branch': 'mozilla-central',
'platform': 'win64'},
'filename': 'mozilla-central-firefox-38.0a1.en-US.win64.installer.exe',
'filename': '1423517445-mozilla-central-firefox-38.0a1.en-US.win64.installer.exe',
'url': 'firefox/tinderbox-builds/mozilla-central-win64/'
'1423517445/firefox-38.0a1.en-US.win64.installer.exe'},
# -a firefox -p win64 --branch=mozilla-central --date=2013-07-23 (old filename format)
{'args': {'application': 'firefox',
'branch': 'mozilla-central',
'platform': 'win64',
'date': '2013-07-23'},
'filename': 'mozilla-central-firefox-25.0a1.en-US.win64-x86_64.installer.exe',
'filename': '1374583608-mozilla-central-firefox-25.0a1.en-US.win64-x86_64.installer.exe',
'url': 'firefox/tinderbox-builds/mozilla-central-win64/'
'1374583608/firefox-25.0a1.en-US.win64-x86_64.installer.exe'},
# -a firefox -p mac64 --branch=mozilla-central
{'args': {'application': 'firefox',
'branch': 'mozilla-central',
'platform': 'mac64'},
'filename': 'mozilla-central-firefox-25.0a1.en-US.mac.dmg',
'filename': '1374583608-mozilla-central-firefox-25.0a1.en-US.mac.dmg',
'url': 'firefox/tinderbox-builds/mozilla-central-macosx64/'
'1374583608/firefox-25.0a1.en-US.mac.dmg'},
# -a firefox -p win32 --branch=mozilla-central --debug-build
{'args': {'application': 'firefox',
'branch': 'mozilla-central',
'debug_build': True,
'platform': 'win32'},
'filename': 'mozilla-central-debug-firefox-25.0a1.en-US.win32.installer.exe',
'filename': '1374583608-mozilla-central-debug-firefox-25.0a1.en-US.win32.installer.exe',
'url': 'firefox/tinderbox-builds/mozilla-central-win32-debug/'
'1374583608/firefox-25.0a1.en-US.win32.installer.exe'},
# -a firefox -p win32 --branch=mozilla-central -l de
Expand All @@ -118,7 +118,7 @@
'branch': 'mozilla-central',
'date': '2013-07-23',
'platform': 'win32'},
'filename': 'mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
'filename': '1374583608-mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
'url': 'firefox/tinderbox-builds/mozilla-central-win32/'
'1374583608/firefox-25.0a1.en-US.win32.installer.exe'},
# -a firefox -p win32 --branch=mozilla-central --date=2013-07-23 --build-number=1
Expand All @@ -127,7 +127,7 @@
'build_number': '1',
'date': '2013-07-23',
'platform': 'win32'},
'filename': 'mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
'filename': '1374568307-mozilla-central-firefox-25.0a1.en-US.win32.installer.exe',
'url': 'firefox/tinderbox-builds/mozilla-central-win32/'
'1374568307/firefox-25.0a1.en-US.win32.installer.exe'},
# -a firefox -p win32 --branch=mozilla-central --date=1374573725
Expand All @@ -142,29 +142,29 @@
{'args': {'application': 'firefox',
'branch': 'mozilla-inbound',
'platform': 'win32'},
'filename': 'mozilla-inbound-firefox-25.0a1.en-US.win32.installer.exe',
'filename': '1374583608-mozilla-inbound-firefox-25.0a1.en-US.win32.installer.exe',
'url': 'firefox/tinderbox-builds/mozilla-inbound-win32/'
'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'},
'filename': 'mozilla-central-firefox-25.0a1.en-US.linux-i686.txt',
'filename': '1374583608-mozilla-central-firefox-25.0a1.en-US.linux-i686.txt',
'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'},
'filename': 'mozilla-central-firefox-25.0a1.en-US.win32.txt',
'filename': '1374568307-mozilla-central-firefox-25.0a1.en-US.win32.txt',
'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'},
'filename': 'mozilla-central-firefox-25.0a1.en-US.mac.txt',
'filename': '1374568307-mozilla-central-firefox-25.0a1.en-US.mac.txt',
'url': 'firefox/tinderbox-builds/mozilla-central-macosx64/'
'1374568307/firefox-25.0a1.en-US.mac.txt'},
]
Expand All @@ -174,43 +174,43 @@
{'args': {'application': 'thunderbird',
'branch': 'comm-central',
'platform': 'linux'},
'filename': 'comm-central-thunderbird-27.0a1.en-US.linux-i686.tar.bz2',
'filename': '1380362686-comm-central-thunderbird-27.0a1.en-US.linux-i686.tar.bz2',
'url': 'thunderbird/tinderbox-builds/comm-central-linux/'
'1380362686/thunderbird-27.0a1.en-US.linux-i686.tar.bz2'},
# -a thunderbird -p linux64 --branch=comm-central
{'args': {'application': 'thunderbird',
'branch': 'comm-central',
'platform': 'linux64'},
'filename': 'comm-central-thunderbird-27.0a1.en-US.linux-x86_64.tar.bz2',
'filename': '1380362686-comm-central-thunderbird-27.0a1.en-US.linux-x86_64.tar.bz2',
'url': 'thunderbird/tinderbox-builds/comm-central-linux64/'
'1380362686/thunderbird-27.0a1.en-US.linux-x86_64.tar.bz2'},
# -a thunderbird -p mac64 --branch=comm-central
{'args': {'application': 'thunderbird',
'branch': 'comm-central',
'platform': 'mac64'},
'filename': 'comm-central-thunderbird-27.0a1.en-US.mac.dmg',
'filename': '1380362686-comm-central-thunderbird-27.0a1.en-US.mac.dmg',
'url': 'thunderbird/tinderbox-builds/comm-central-macosx64/'
'1380362686/thunderbird-27.0a1.en-US.mac.dmg'},
# -a thunderbird -p win32 --branch=comm-central
{'args': {'application': 'thunderbird',
'branch': 'comm-central',
'platform': 'win32'},
'filename': 'comm-central-thunderbird-27.0a1.en-US.win32.installer.exe',
'filename': '1380362686-comm-central-thunderbird-27.0a1.en-US.win32.installer.exe',
'url': 'thunderbird/tinderbox-builds/comm-central-win32/'
'1380362686/thunderbird-27.0a1.en-US.win32.installer.exe'},
# -a thunderbird -p win64 --branch=comm-central
{'args': {'application': 'thunderbird',
'branch': 'comm-central',
'platform': 'win64'},
'filename': 'comm-central-thunderbird-27.0a1.en-US.win64-x86_64.installer.exe',
'filename': '1380362686-comm-central-thunderbird-27.0a1.en-US.win64-x86_64.installer.exe',
'url': 'thunderbird/tinderbox-builds/comm-central-win64/'
'1380362686/thunderbird-27.0a1.en-US.win64-x86_64.installer.exe'},
# -a thunderbird -p win32 --branch=comm-central --debug-build
{'args': {'application': 'thunderbird',
'branch': 'comm-central',
'debug_build': True,
'platform': 'win32'},
'filename': 'comm-central-debug-thunderbird-27.0a1.en-US.win32.installer.exe',
'filename': '1380362686-comm-central-debug-thunderbird-27.0a1.en-US.win32.installer.exe',
'url': 'thunderbird/tinderbox-builds/comm-central-win32-debug/'
'1380362686/thunderbird-27.0a1.en-US.win32.installer.exe'},
# -a thunderbird -p win32 --branch=comm-central -l de
Expand All @@ -234,7 +234,7 @@
'branch': 'comm-central',
'date': '2013-09-28',
'platform': 'win32'},
'filename': 'comm-central-thunderbird-27.0a1.en-US.win32.installer.exe',
'filename': '1380362686-comm-central-thunderbird-27.0a1.en-US.win32.installer.exe',
'url': 'thunderbird/tinderbox-builds/comm-central-win32/'
'1380362686/thunderbird-27.0a1.en-US.win32.installer.exe'},
# -a thunderbird -p win32 --branch=comm-central --date=2013-07-24 --build-number=1
Expand All @@ -243,7 +243,7 @@
'build_number': '1',
'date': '2013-09-28',
'platform': 'win32'},
'filename': 'comm-central-thunderbird-27.0a1.en-US.win32.installer.exe',
'filename': '1380362527-comm-central-thunderbird-27.0a1.en-US.win32.installer.exe',
'url': 'thunderbird/tinderbox-builds/comm-central-win32/'
'1380362527/thunderbird-27.0a1.en-US.win32.installer.exe'},
# -a thunderbird -p win32 --branch=comm-central --date=1380362527
Expand All @@ -258,7 +258,7 @@
{'args': {'application': 'thunderbird',
'branch': 'comm-aurora',
'platform': 'win32'},
'filename': 'comm-aurora-thunderbird-27.0a1.en-US.win32.installer.exe',
'filename': '1380362686-comm-aurora-thunderbird-27.0a1.en-US.win32.installer.exe',
'url': 'thunderbird/tinderbox-builds/comm-aurora-win32/'
'1380362686/thunderbird-27.0a1.en-US.win32.installer.exe'}
]
Expand Down