Add Thunderbird (and Firefox) daily default branch handling (#247) - …

…re-arrange test cases
mozilla · May 7, 2024 · 21ab747 · 21ab747
1 parent 4890b4a
commit 21ab747
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/tests/daily_scraper/test_daily_scraper.py b/tests/daily_scraper/test_daily_scraper.py
@@ -16,9 +16,6 @@
     ({'platform': 'win32'},
      '2013-10-01-03-02-04-mozilla-central-firefox-27.0a1.en-US.win32.installer.exe',
      'firefox/nightly/2013/10/2013-10-01-03-02-04-mozilla-central/firefox-27.0a1.en-US.win32.installer.exe'),
-    ({'platform': 'win32', 'branch': 'mozilla-central'},
-     '2013-10-01-03-02-04-mozilla-central-firefox-27.0a1.en-US.win32.installer.exe',
-     'firefox/nightly/2013/10/2013-10-01-03-02-04-mozilla-central/firefox-27.0a1.en-US.win32.installer.exe'),
     ({'platform': 'win64'},
      '2013-10-01-03-02-04-mozilla-central-firefox-27.0a1.en-US.win64.installer.exe',
      'firefox/nightly/2013/10/2013-10-01-03-02-04-mozilla-central/firefox-27.0a1.en-US.win64.installer.exe'),
@@ -31,6 +28,9 @@
     ({'platform': 'mac'},
      '2013-10-01-03-02-04-mozilla-central-firefox-27.0a1.en-US.mac.dmg',
      'firefox/nightly/2013/10/2013-10-01-03-02-04-mozilla-central/firefox-27.0a1.en-US.mac.dmg'),
+    ({'platform': 'win32', 'branch': 'mozilla-central'},
+     '2013-10-01-03-02-04-mozilla-central-firefox-27.0a1.en-US.win32.installer.exe',
+     'firefox/nightly/2013/10/2013-10-01-03-02-04-mozilla-central/firefox-27.0a1.en-US.win32.installer.exe'),
     ({'platform': 'linux', 'extension': 'txt'},
      '2013-10-01-03-02-04-mozilla-central-firefox-27.0a1.en-US.linux-i686.txt',
      'firefox/nightly/2013/10/2013-10-01-03-02-04-mozilla-central/firefox-27.0a1.en-US.linux-i686.txt'),
@@ -73,9 +73,6 @@
     ({'application': 'thunderbird', 'platform': 'linux'},
      '2013-10-01-03-02-04-comm-central-thunderbird-27.0a1.en-US.linux-i686.tar.bz2',
      'thunderbird/nightly/2013/10/2013-10-01-03-02-04-comm-central/thunderbird-27.0a1.en-US.linux-i686.tar.bz2'),
-    ({'application': 'thunderbird', 'platform': 'linux', 'branch': 'comm-central'},
-     '2013-10-01-03-02-04-comm-central-thunderbird-27.0a1.en-US.linux-i686.tar.bz2',
-     'thunderbird/nightly/2013/10/2013-10-01-03-02-04-comm-central/thunderbird-27.0a1.en-US.linux-i686.tar.bz2'),
     ({'application': 'thunderbird', 'platform': 'linux64'},
      '2013-10-01-03-02-04-comm-central-thunderbird-27.0a1.en-US.linux-x86_64.tar.bz2',
      'thunderbird/nightly/2013/10/2013-10-01-03-02-04-comm-central/thunderbird-27.0a1.en-US.linux-x86_64.tar.bz2'),
@@ -88,6 +85,9 @@
     ({'application': 'thunderbird', 'platform': 'win64'},
      '2013-10-01-03-02-04-comm-central-thunderbird-27.0a1.en-US.win64-x86_64.installer.exe',
      'thunderbird/nightly/2013/10/2013-10-01-03-02-04-comm-central/thunderbird-27.0a1.en-US.win64-x86_64.installer.exe'),
+    ({'application': 'thunderbird', 'platform': 'linux', 'branch': 'comm-central'},
+     '2013-10-01-03-02-04-comm-central-thunderbird-27.0a1.en-US.linux-i686.tar.bz2',
+     'thunderbird/nightly/2013/10/2013-10-01-03-02-04-comm-central/thunderbird-27.0a1.en-US.linux-i686.tar.bz2'),
     ({'application': 'thunderbird', 'platform': 'linux', 'extension': 'txt'},
      '2013-10-01-03-02-04-comm-central-thunderbird-27.0a1.en-US.linux-i686.txt',
      'thunderbird/nightly/2013/10/2013-10-01-03-02-04-comm-central/thunderbird-27.0a1.en-US.linux-i686.txt'),

diff --git a/tests/tinderbox_scraper/test_tinderbox_scraper.py b/tests/tinderbox_scraper/test_tinderbox_scraper.py
@@ -107,10 +107,6 @@
      '1380362686-comm-central-thunderbird-27.0a1.en-US.linux-i686.tar.bz2',
      'thunderbird/tinderbox-builds/comm-central-linux/'
      '1380362686/thunderbird-27.0a1.en-US.linux-i686.tar.bz2'),
-    ({'application': 'thunderbird', 'branch': 'comm-central', 'platform': 'linux'},
-     '1380362686-comm-central-thunderbird-27.0a1.en-US.linux-i686.tar.bz2',
-     'thunderbird/tinderbox-builds/comm-central-linux/'
-     '1380362686/thunderbird-27.0a1.en-US.linux-i686.tar.bz2'),
     ({'application': 'thunderbird', 'platform': 'linux64'},
      '1380362686-comm-central-thunderbird-27.0a1.en-US.linux-x86_64.tar.bz2',
      'thunderbird/tinderbox-builds/comm-central-linux64/'
@@ -127,6 +123,10 @@
      '1380362686-comm-central-thunderbird-27.0a1.en-US.win64-x86_64.installer.exe',
      'thunderbird/tinderbox-builds/comm-central-win64/'
      '1380362686/thunderbird-27.0a1.en-US.win64-x86_64.installer.exe'),
+    ({'application': 'thunderbird', 'branch': 'comm-central', 'platform': 'linux'},
+     '1380362686-comm-central-thunderbird-27.0a1.en-US.linux-i686.tar.bz2',
+     'thunderbird/tinderbox-builds/comm-central-linux/'
+     '1380362686/thunderbird-27.0a1.en-US.linux-i686.tar.bz2'),
     ({'application': 'thunderbird', 'debug_build': True, 'platform': 'win32'},
      '1380362686-comm-central-debug-thunderbird-27.0a1.en-US.win32.installer.exe',
      'thunderbird/tinderbox-builds/comm-central-win32-debug/'