diff --git a/testing/perfdocs/generated/raptor.rst b/testing/perfdocs/generated/raptor.rst
index 54dff7c7230910ca6eed6707bb24e0f6997633ca..2c72c235b6dc77a1d24334c5380edc1bfec575d3 100644
--- a/testing/perfdocs/generated/raptor.rst
+++ b/testing/perfdocs/generated/raptor.rst
@@ -519,1010 +519,6 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **use live sites**: false
-.. dropdown:: raptor-tp6-amazon (WX, FF, CH, CU)
-
- 1. **raptor-tp6-amazon-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-amazon.manifest
- * **playback recordings**: mitm5-linux-firefox-amazon.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.amazon.com/s?k=laptop&ref=nb_sb_noss_1>`__
-
- 2. **raptor-tp6-amazon-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-amazon.manifest
- * **playback recordings**: mitm5-linux-firefox-amazon.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.amazon.com/s?k=laptop&ref=nb_sb_noss_1>`__
-
- 3. **raptor-tp6-amazon-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-amazon.manifest
- * **playback recordings**: mitm5-linux-firefox-amazon.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.amazon.com/s?k=laptop&ref=nb_sb_noss_1>`__
-
-
-.. dropdown:: raptor-tp6-apple (WX, FF, CH, CU)
-
- 1. **raptor-tp6-apple-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-apple.manifest
- * **playback recordings**: mitm5-linux-firefox-apple.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.apple.com/macbook-pro/>`__
-
- 2. **raptor-tp6-apple-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-apple.manifest
- * **playback recordings**: mitm5-linux-firefox-apple.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.apple.com/macbook-pro/>`__
-
- 3. **raptor-tp6-apple-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-apple.manifest
- * **playback recordings**: mitm5-linux-firefox-apple.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.apple.com/macbook-pro/>`__
-
-
-.. dropdown:: raptor-tp6-bing (WX, FF, CH, CU)
-
- 1. **raptor-tp6-bing-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-bing-search.manifest
- * **playback recordings**: mitm5-linux-firefox-bing-search.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.bing.com/search?q=barack+obama>`__
-
- 2. **raptor-tp6-bing-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-bing-search.manifest
- * **playback recordings**: mitm5-linux-firefox-bing-search.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.bing.com/search?q=barack+obama>`__
-
- 3. **raptor-tp6-bing-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-bing-search.manifest
- * **playback recordings**: mitm5-linux-firefox-bing-search.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.bing.com/search?q=barack+obama>`__
-
-
-.. dropdown:: raptor-tp6-cnn-ampstories (WX, FF)
-
- 1. **raptor-tp6-cnn-ampstories-firefox**
-
- * **alert on**: fnbpaint, fcp, dcf, loadtime
- * **alert threshold**: 5.0
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **test url**: `<https://cnn.com/ampstories/us/why-hurricane-michael-is-a-monster-unlike-any-other>`__
-
-
-.. dropdown:: raptor-tp6-docs (WX, FF, CH, CU)
-
- 1. **raptor-tp6-docs-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-google-docs.manifest
- * **playback recordings**: mitm5-linux-firefox-google-docs.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://docs.google.com/document/d/1US-07msg12slQtI_xchzYxcKlTs6Fp7WqIc6W5GK5M8/edit?usp=sharing>`__
-
- 2. **raptor-tp6-docs-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-google-docs.manifest
- * **playback recordings**: mitm5-linux-firefox-google-docs.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://docs.google.com/document/d/1US-07msg12slQtI_xchzYxcKlTs6Fp7WqIc6W5GK5M8/edit?usp=sharing>`__
-
- 3. **raptor-tp6-docs-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-google-docs.manifest
- * **playback recordings**: mitm5-linux-firefox-google-docs.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://docs.google.com/document/d/1US-07msg12slQtI_xchzYxcKlTs6Fp7WqIc6W5GK5M8/edit?usp=sharing>`__
-
-
-.. dropdown:: raptor-tp6-ebay (WX, FF, CH, CU)
-
- 1. **raptor-tp6-ebay-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-ebay.manifest
- * **playback recordings**: mitm5-linux-firefox-ebay.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.ebay.com/>`__
-
- 2. **raptor-tp6-ebay-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-ebay.manifest
- * **playback recordings**: mitm5-linux-firefox-ebay.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.ebay.com/>`__
-
- 3. **raptor-tp6-ebay-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-ebay.manifest
- * **playback recordings**: mitm5-linux-firefox-ebay.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.ebay.com/>`__
-
-
-.. dropdown:: raptor-tp6-facebook (WX, CH, CU)
-
- 1. **raptor-tp6-facebook-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-facebook.manifest
- * **playback recordings**: mitm5-linux-firefox-facebook.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.facebook.com>`__
-
- 2. **raptor-tp6-facebook-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-facebook.manifest
- * **playback recordings**: mitm5-linux-firefox-facebook.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.facebook.com>`__
-
- 3. **raptor-tp6-facebook-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-facebook.manifest
- * **playback recordings**: mitm5-linux-firefox-facebook.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.facebook.com>`__
-
-
-.. dropdown:: raptor-tp6-fandom (WX, FF, CH, CU)
-
- 1. **raptor-tp6-fandom-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-fandom.manifest
- * **playback recordings**: mitm5-linux-firefox-fandom.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.fandom.com/articles/fallout-76-will-live-and-die-on-the-creativity-of-its-playerbase>`__
-
- 2. **raptor-tp6-fandom-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-fandom.manifest
- * **playback recordings**: mitm5-linux-firefox-fandom.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.fandom.com/articles/fallout-76-will-live-and-die-on-the-creativity-of-its-playerbase>`__
-
- 3. **raptor-tp6-fandom-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-fandom.manifest
- * **playback recordings**: mitm5-linux-firefox-fandom.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.fandom.com/articles/fallout-76-will-live-and-die-on-the-creativity-of-its-playerbase>`__
-
-
-.. dropdown:: raptor-tp6-google (WX, FF, CH, CU)
-
- 1. **raptor-tp6-google-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-google-search.manifest
- * **playback recordings**: mitm5-linux-firefox-google-search.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.google.com/search?hl=en&q=barack+obama&cad=h>`__
-
- 2. **raptor-tp6-google-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-google-search.manifest
- * **playback recordings**: mitm5-linux-firefox-google-search.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.google.com/search?hl=en&q=barack+obama&cad=h>`__
-
- 3. **raptor-tp6-google-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-google-search.manifest
- * **playback recordings**: mitm5-linux-firefox-google-search.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.google.com/search?hl=en&q=barack+obama&cad=h>`__
-
-
-.. dropdown:: raptor-tp6-google-mail (WX, FF, CH, CU)
-
- 1. **raptor-tp6-google-mail-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-google-mail.manifest
- * **playback recordings**: mitm5-linux-firefox-google-mail.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://mail.google.com/>`__
-
- 2. **raptor-tp6-google-mail-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-google-mail.manifest
- * **playback recordings**: mitm5-linux-firefox-google-mail.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://mail.google.com/>`__
-
- 3. **raptor-tp6-google-mail-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-google-mail.manifest
- * **playback recordings**: mitm5-linux-firefox-google-mail.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://mail.google.com/>`__
-
-
-.. dropdown:: raptor-tp6-imdb (WX, FF, CH, CU)
-
- 1. **raptor-tp6-imdb-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-imdb.manifest
- * **playback recordings**: mitm5-linux-firefox-imdb.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.imdb.com/title/tt0084967/?ref_=nv_sr_2>`__
-
- 2. **raptor-tp6-imdb-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-imdb.manifest
- * **playback recordings**: mitm5-linux-firefox-imdb.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.imdb.com/title/tt0084967/?ref_=nv_sr_2>`__
-
- 3. **raptor-tp6-imdb-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-imdb.manifest
- * **playback recordings**: mitm5-linux-firefox-imdb.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.imdb.com/title/tt0084967/?ref_=nv_sr_2>`__
-
-
-.. dropdown:: raptor-tp6-imgur (WX, FF, CH, CU)
-
- 1. **raptor-tp6-imgur-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-imgur.manifest
- * **playback recordings**: mitm5-linux-firefox-imgur.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://imgur.com/gallery/m5tYJL6>`__
-
- 2. **raptor-tp6-imgur-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-imgur.manifest
- * **playback recordings**: mitm5-linux-firefox-imgur.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://imgur.com/gallery/m5tYJL6>`__
-
- 3. **raptor-tp6-imgur-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-imgur.manifest
- * **playback recordings**: mitm5-linux-firefox-imgur.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://imgur.com/gallery/m5tYJL6>`__
-
-
-.. dropdown:: raptor-tp6-instagram (WX, FF, CH, CU)
-
- 1. **raptor-tp6-instagram-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-instagram.manifest
- * **playback recordings**: mitm5-linux-firefox-instagram.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.instagram.com/>`__
-
- 2. **raptor-tp6-instagram-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-instagram.manifest
- * **playback recordings**: mitm5-linux-firefox-instagram.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.instagram.com/>`__
-
- 3. **raptor-tp6-instagram-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-instagram.manifest
- * **playback recordings**: mitm5-linux-firefox-instagram.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.instagram.com/>`__
-
-
-.. dropdown:: raptor-tp6-linkedin (WX, FF, CH, CU)
-
- 1. **raptor-tp6-linkedin-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-linkedin.manifest
- * **playback recordings**: mitm5-linux-firefox-linkedin.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.linkedin.com/in/thommy-harris-hk-385723106/>`__
-
- 2. **raptor-tp6-linkedin-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-linkedin.manifest
- * **playback recordings**: mitm5-linux-firefox-linkedin.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.linkedin.com/in/thommy-harris-hk-385723106/>`__
-
- 3. **raptor-tp6-linkedin-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-linkedin.manifest
- * **playback recordings**: mitm5-linux-firefox-linkedin.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.linkedin.com/in/thommy-harris-hk-385723106/>`__
-
-
-.. dropdown:: raptor-tp6-microsoft (WX, FF, CH, CU)
-
- 1. **raptor-tp6-microsoft-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-microsoft.manifest
- * **playback recordings**: mitm5-linux-firefox-microsoft.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.microsoft.com/en-us/>`__
-
- 2. **raptor-tp6-microsoft-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-microsoft.manifest
- * **playback recordings**: mitm5-linux-firefox-microsoft.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.microsoft.com/en-us/>`__
-
- 3. **raptor-tp6-microsoft-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-microsoft.manifest
- * **playback recordings**: mitm5-linux-firefox-microsoft.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.microsoft.com/en-us/>`__
-
-
-.. dropdown:: raptor-tp6-netflix (WX, FF, CH, CU)
-
- 1. **raptor-tp6-netflix-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-netflix.manifest
- * **playback recordings**: mitm5-linux-firefox-netflix.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.netflix.com/title/80117263>`__
-
- 2. **raptor-tp6-netflix-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-netflix.manifest
- * **playback recordings**: mitm5-linux-firefox-netflix.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.netflix.com/title/80117263>`__
-
- 3. **raptor-tp6-netflix-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-netflix.manifest
- * **playback recordings**: mitm5-linux-firefox-netflix.mp
- * **playback version**: 5.1.1
- * **preferences**: {"media.autoplay.default": 1,
-"media.eme.enabled": true}
- * **test url**: `<https://www.netflix.com/title/80117263>`__
-
-
-.. dropdown:: raptor-tp6-office (WX, FF, CH, CU)
-
- 1. **raptor-tp6-office-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-live-office.manifest
- * **playback recordings**: mitm5-linux-firefox-live-office.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://office.live.com/start/Word.aspx?omkt=en-US>`__
-
- 2. **raptor-tp6-office-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-live-office.manifest
- * **playback recordings**: mitm5-linux-firefox-live-office.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://office.live.com/start/Word.aspx?omkt=en-US>`__
-
- 3. **raptor-tp6-office-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-live-office.manifest
- * **playback recordings**: mitm5-linux-firefox-live-office.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://office.live.com/start/Word.aspx?omkt=en-US>`__
-
-
-.. dropdown:: raptor-tp6-outlook (WX, FF, CH, CU)
-
- 1. **raptor-tp6-outlook-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-live.manifest
- * **playback recordings**: mitm5-linux-firefox-live.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://outlook.live.com/mail/inbox>`__
-
- 2. **raptor-tp6-outlook-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-live.manifest
- * **playback recordings**: mitm5-linux-firefox-live.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://outlook.live.com/mail/inbox>`__
-
- 3. **raptor-tp6-outlook-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-live.manifest
- * **playback recordings**: mitm5-linux-firefox-live.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://outlook.live.com/mail/inbox>`__
-
-
-.. dropdown:: raptor-tp6-paypal (WX, FF, CH, CU)
-
- 1. **raptor-tp6-paypal-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-paypal.manifest
- * **playback recordings**: mitm5-linux-firefox-paypal.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.paypal.com/myaccount/summary/>`__
-
- 2. **raptor-tp6-paypal-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-paypal.manifest
- * **playback recordings**: mitm5-linux-firefox-paypal.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.paypal.com/myaccount/summary/>`__
-
- 3. **raptor-tp6-paypal-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-paypal.manifest
- * **playback recordings**: mitm5-linux-firefox-paypal.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.paypal.com/myaccount/summary/>`__
-
-
-.. dropdown:: raptor-tp6-pinterest (WX, FF, CH, CU)
-
- 1. **raptor-tp6-pinterest-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-pinterest.manifest
- * **playback recordings**: mitm5-linux-firefox-pinterest.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://pinterest.com/>`__
-
- 2. **raptor-tp6-pinterest-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-pinterest.manifest
- * **playback recordings**: mitm5-linux-firefox-pinterest.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://pinterest.com/>`__
-
- 3. **raptor-tp6-pinterest-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-pinterest.manifest
- * **playback recordings**: mitm5-linux-firefox-pinterest.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://pinterest.com/>`__
-
-
-.. dropdown:: raptor-tp6-reddit (WX, FF, CH, CU)
-
- 1. **raptor-tp6-reddit-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-reddit.manifest
- * **playback recordings**: mitm5-linux-firefox-reddit.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.reddit.com/r/technology/comments/9sqwyh/we_posed_as_100_senators_to_run_ads_on_facebook/>`__
-
- 2. **raptor-tp6-reddit-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-reddit.manifest
- * **playback recordings**: mitm5-linux-firefox-reddit.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.reddit.com/r/technology/comments/9sqwyh/we_posed_as_100_senators_to_run_ads_on_facebook/>`__
-
- 3. **raptor-tp6-reddit-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-reddit.manifest
- * **playback recordings**: mitm5-linux-firefox-reddit.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.reddit.com/r/technology/comments/9sqwyh/we_posed_as_100_senators_to_run_ads_on_facebook/>`__
-
-
-.. dropdown:: raptor-tp6-sheets (WX, FF, CH, CU)
-
- 1. **raptor-tp6-sheets-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-google-sheets.manifest
- * **playback recordings**: mitm5-linux-firefox-google-sheets.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://docs.google.com/spreadsheets/d/1jT9qfZFAeqNoOK97gruc34Zb7y_Q-O_drZ8kSXT-4D4/edit?usp=sharing>`__
-
- 2. **raptor-tp6-sheets-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-google-sheets.manifest
- * **playback recordings**: mitm5-linux-firefox-google-sheets.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://docs.google.com/spreadsheets/d/1jT9qfZFAeqNoOK97gruc34Zb7y_Q-O_drZ8kSXT-4D4/edit?usp=sharing>`__
-
- 3. **raptor-tp6-sheets-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-google-sheets.manifest
- * **playback recordings**: mitm5-linux-firefox-google-sheets.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://docs.google.com/spreadsheets/d/1jT9qfZFAeqNoOK97gruc34Zb7y_Q-O_drZ8kSXT-4D4/edit?usp=sharing>`__
-
-
-.. dropdown:: raptor-tp6-slides (WX, FF, CH, CU)
-
- 1. **raptor-tp6-slides-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-google-slides.manifest
- * **playback recordings**: mitm5-linux-firefox-google-slides.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://docs.google.com/presentation/d/1Ici0ceWwpFvmIb3EmKeWSq_vAQdmmdFcWqaiLqUkJng/edit?usp=sharing>`__
-
- 2. **raptor-tp6-slides-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-google-slides.manifest
- * **playback recordings**: mitm5-linux-firefox-google-slides.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://docs.google.com/presentation/d/1Ici0ceWwpFvmIb3EmKeWSq_vAQdmmdFcWqaiLqUkJng/edit?usp=sharing>`__
-
- 3. **raptor-tp6-slides-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-google-slides.manifest
- * **playback recordings**: mitm5-linux-firefox-google-slides.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://docs.google.com/presentation/d/1Ici0ceWwpFvmIb3EmKeWSq_vAQdmmdFcWqaiLqUkJng/edit?usp=sharing>`__
-
-
-.. dropdown:: raptor-tp6-tumblr (WX, FF, CH, CU)
-
- 1. **raptor-tp6-tumblr-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-tumblr.manifest
- * **playback recordings**: mitm5-linux-firefox-tumblr.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.tumblr.com/dashboard>`__
-
- 2. **raptor-tp6-tumblr-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-tumblr.manifest
- * **playback recordings**: mitm5-linux-firefox-tumblr.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.tumblr.com/dashboard>`__
-
- 3. **raptor-tp6-tumblr-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-tumblr.manifest
- * **playback recordings**: mitm5-linux-firefox-tumblr.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.tumblr.com/dashboard>`__
-
-
-.. dropdown:: raptor-tp6-twitch (WX, FF, CH, CU)
-
- 1. **raptor-tp6-twitch-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-twitch.manifest
- * **playback recordings**: mitm5-linux-firefox-twitch.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.twitch.tv/videos/326804629>`__
-
- 2. **raptor-tp6-twitch-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-twitch.manifest
- * **playback recordings**: mitm5-linux-firefox-twitch.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.twitch.tv/videos/326804629>`__
-
- 3. **raptor-tp6-twitch-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-twitch.manifest
- * **playback recordings**: mitm5-linux-firefox-twitch.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.twitch.tv/videos/326804629>`__
-
-
-.. dropdown:: raptor-tp6-twitter (WX, FF, CH, CU)
-
- 1. **raptor-tp6-twitter-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-twitter.manifest
- * **playback recordings**: mitm5-linux-firefox-twitter.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://twitter.com/BarackObama>`__
-
- 2. **raptor-tp6-twitter-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-twitter.manifest
- * **playback recordings**: mitm5-linux-firefox-twitter.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://twitter.com/BarackObama>`__
-
- 3. **raptor-tp6-twitter-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-twitter.manifest
- * **playback recordings**: mitm5-linux-firefox-twitter.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://twitter.com/BarackObama>`__
-
-
-.. dropdown:: raptor-tp6-wikipedia (WX, FF, CH, CU)
-
- 1. **raptor-tp6-wikipedia-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-wikipedia.manifest
- * **playback recordings**: mitm5-linux-firefox-wikipedia.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://en.wikipedia.org/wiki/Barack_Obama>`__
-
- 2. **raptor-tp6-wikipedia-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-wikipedia.manifest
- * **playback recordings**: mitm5-linux-firefox-wikipedia.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://en.wikipedia.org/wiki/Barack_Obama>`__
-
- 3. **raptor-tp6-wikipedia-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-wikipedia.manifest
- * **playback recordings**: mitm5-linux-firefox-wikipedia.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://en.wikipedia.org/wiki/Barack_Obama>`__
-
-
-.. dropdown:: raptor-tp6-yahoo-mail (WX, FF, CH, CU)
-
- 1. **raptor-tp6-yahoo-mail-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-yahoo-mail.manifest
- * **playback recordings**: mitm5-linux-firefox-yahoo-mail.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://mail.yahoo.com/>`__
-
- 2. **raptor-tp6-yahoo-mail-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-yahoo-mail.manifest
- * **playback recordings**: mitm5-linux-firefox-yahoo-mail.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://mail.yahoo.com/>`__
-
- 3. **raptor-tp6-yahoo-mail-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-yahoo-mail.manifest
- * **playback recordings**: mitm5-linux-firefox-yahoo-mail.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://mail.yahoo.com/>`__
-
-
-.. dropdown:: raptor-tp6-yahoo-news (WX, FF, CH, CU)
-
- 1. **raptor-tp6-yahoo-news-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-yahoo-news.manifest
- * **playback recordings**: mitm5-linux-firefox-yahoo-news.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.yahoo.com/lifestyle/police-respond-noise-complaint-end-playing-video-games-respectful-tenants-002329963.html>`__
-
- 2. **raptor-tp6-yahoo-news-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-yahoo-news.manifest
- * **playback recordings**: mitm5-linux-firefox-yahoo-news.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.yahoo.com/lifestyle/police-respond-noise-complaint-end-playing-video-games-respectful-tenants-002329963.html>`__
-
- 3. **raptor-tp6-yahoo-news-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-yahoo-news.manifest
- * **playback recordings**: mitm5-linux-firefox-yahoo-news.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.yahoo.com/lifestyle/police-respond-noise-complaint-end-playing-video-games-respectful-tenants-002329963.html>`__
-
-
-.. dropdown:: raptor-tp6-yandex (WX, FF, CH, CU)
-
- 1. **raptor-tp6-yandex-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-yandex.manifest
- * **playback recordings**: mitm5-linux-firefox-yandex.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://yandex.ru/search/?text=barack%20obama&lr=10115>`__
-
- 2. **raptor-tp6-yandex-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-yandex.manifest
- * **playback recordings**: mitm5-linux-firefox-yandex.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://yandex.ru/search/?text=barack%20obama&lr=10115>`__
-
- 3. **raptor-tp6-yandex-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-yandex.manifest
- * **playback recordings**: mitm5-linux-firefox-yandex.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://yandex.ru/search/?text=barack%20obama&lr=10115>`__
-
-
-.. dropdown:: raptor-tp6-youtube (WX, FF, CH, CU)
-
- 1. **raptor-tp6-youtube-chrome**
-
- * **apps**: chrome
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-youtube.manifest
- * **playback recordings**: mitm5-linux-firefox-youtube.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.youtube.com>`__
-
- 2. **raptor-tp6-youtube-chromium**
-
- * **apps**: chromium
- * **expected**: pass
- * **measure**: fcp, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-youtube.manifest
- * **playback recordings**: mitm5-linux-firefox-youtube.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.youtube.com>`__
-
- 3. **raptor-tp6-youtube-firefox**
-
- * **apps**: firefox
- * **expected**: pass
- * **measure**: fnbpaint, fcp, dcf, loadtime
- * **playback pageset manifest**: mitm5-linux-firefox-youtube.manifest
- * **playback recordings**: mitm5-linux-firefox-youtube.mp
- * **playback version**: 5.1.1
- * **test url**: `<https://www.youtube.com>`__
-
-
.. dropdown:: reddit (BT, FF, CH, CU)
* **alert on**: fcp, loadtime
diff --git a/testing/raptor/raptor/perfdocs/config.yml b/testing/raptor/raptor/perfdocs/config.yml
index fffc9ae5bc51480931d4a36f7845203ad2f1a909..334e1f20d66bdc8c913e1cf900acc4c269dc999c 100644
--- a/testing/raptor/raptor/perfdocs/config.yml
+++ b/testing/raptor/raptor/perfdocs/config.yml
@@ -9,37 +9,6 @@ suites:
desktop:
description: "Tests for page-load performance. The links direct to the actual websites that are being tested. (WX: WebExtension, BT: Browsertime, FF: Firefox, CH: Chrome, CU: Chromium)"
tests:
- raptor-tp6-amazon: "WX, FF, CH, CU"
- raptor-tp6-cnn-ampstories: "WX, FF"
- raptor-tp6-facebook: "WX, CH, CU"
- raptor-tp6-google: "WX, FF, CH, CU"
- raptor-tp6-youtube: "WX, FF, CH, CU"
- raptor-tp6-docs: "WX, FF, CH, CU"
- raptor-tp6-sheets: "WX, FF, CH, CU"
- raptor-tp6-slides: "WX, FF, CH, CU"
- raptor-tp6-imdb: "WX, FF, CH, CU"
- raptor-tp6-imgur: "WX, FF, CH, CU"
- raptor-tp6-fandom: "WX, FF, CH, CU"
- raptor-tp6-bing: "WX, FF, CH, CU"
- raptor-tp6-yandex: "WX, FF, CH, CU"
- raptor-tp6-twitch: "WX, FF, CH, CU"
- raptor-tp6-apple: "WX, FF, CH, CU"
- raptor-tp6-microsoft: "WX, FF, CH, CU"
- raptor-tp6-reddit: "WX, FF, CH, CU"
- raptor-tp6-yahoo-news: "WX, FF, CH, CU"
- raptor-tp6-netflix: "WX, FF, CH, CU"
- raptor-tp6-instagram: "WX, FF, CH, CU"
- raptor-tp6-twitter: "WX, FF, CH, CU"
- raptor-tp6-yahoo-mail: "WX, FF, CH, CU"
- raptor-tp6-ebay: "WX, FF, CH, CU"
- raptor-tp6-linkedin: "WX, FF, CH, CU"
- raptor-tp6-wikipedia: "WX, FF, CH, CU"
- raptor-tp6-google-mail: "WX, FF, CH, CU"
- raptor-tp6-office: "WX, FF, CH, CU"
- raptor-tp6-outlook: "WX, FF, CH, CU"
- raptor-tp6-pinterest: "WX, FF, CH, CU"
- raptor-tp6-paypal: "WX, FF, CH, CU"
- raptor-tp6-tumblr: "WX, FF, CH, CU"
amazon: "BT, FF, CH, CU"
apple: "BT, FF, CH, CU"
bing-search: "BT, FF, CH, CU"
diff --git a/testing/raptor/raptor/raptor.ini b/testing/raptor/raptor/raptor.ini
index 419c404efd0f18863e35f7667dd7dae91097d884..f3f9266dbc1fe7785d53a9d877322f0fa2ad2c52 100644
--- a/testing/raptor/raptor/raptor.ini
+++ b/testing/raptor/raptor/raptor.ini
@@ -1,6 +1,3 @@
-# raptor pageload tests desktop
-[include:tests/tp6/desktop-tests.ini]
-
# raptor benchmark tests
[include:tests/benchmarks/raptor-assorted-dom.ini]
[include:tests/benchmarks/raptor-ares6.ini]
diff --git a/testing/raptor/raptor/tests/tp6/desktop-tests.ini b/testing/raptor/raptor/tests/tp6/desktop-tests.ini
deleted file mode 100644
index 3ad90c2288938617060e1118ad8bd1b94b56ff56..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop-tests.ini
+++ /dev/null
@@ -1,57 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Desktop page load defaults
-[DEFAULT]
-type = pageload
-playback = mitmproxy
-
-# set for warm page load
-page_cycles = 25
-
-# active only if cold setting is provided by command line or manifest
-browser_cycles = 25
-
-page_timeout = 60000
-unit = ms
-lower_is_better = true
-
-gecko_profile_interval = 1
-gecko_profile_entries = 14000000
-
-alert_threshold = 2.0
-alert_on = fcp, loadtime
-
-[include:desktop/amazon.ini]
-[include:desktop/apple.ini]
-[include:desktop/bing-search.ini]
-[include:desktop/cnn-ampstories.ini]
-[include:desktop/ebay.ini]
-[include:desktop/facebook.ini]
-[include:desktop/facebook-redesign.ini]
-[include:desktop/fandom.ini]
-[include:desktop/google-docs.ini]
-[include:desktop/google-mail.ini]
-[include:desktop/google-search.ini]
-[include:desktop/google-sheets.ini]
-[include:desktop/google-slides.ini]
-[include:desktop/imdb.ini]
-[include:desktop/imgur.ini]
-[include:desktop/instagram.ini]
-[include:desktop/linkedin.ini]
-[include:desktop/microsoft.ini]
-[include:desktop/netflix.ini]
-[include:desktop/office.ini]
-[include:desktop/outlook.ini]
-[include:desktop/paypal.ini]
-[include:desktop/pinterest.ini]
-[include:desktop/reddit.ini]
-[include:desktop/tumblr.ini]
-[include:desktop/twitch.ini]
-[include:desktop/twitter.ini]
-[include:desktop/wikipedia.ini]
-[include:desktop/yahoo-mail.ini]
-[include:desktop/yahoo-news.ini]
-[include:desktop/yandex.ini]
-[include:desktop/youtube.ini]
diff --git a/testing/raptor/raptor/tests/tp6/desktop/amazon.ini b/testing/raptor/raptor/tests/tp6/desktop/amazon.ini
deleted file mode 100644
index afe8d57fc698cfd0bc0b44b40645335f75e9ec9a..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/amazon.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-amazon
-
-[DEFAULT]
-test_url = https://www.amazon.com/s?k=laptop&ref=nb_sb_noss_1
-playback_version = 5.1.1
-playback_pageset_manifest = mitm5-linux-firefox-amazon.manifest
-playback_recordings = mitm5-linux-firefox-amazon.mp
-
-[raptor-tp6-amazon-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-amazon-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-amazon-chromium]
-apps = chromium
-measure = fcp, loadtime
-
diff --git a/testing/raptor/raptor/tests/tp6/desktop/apple.ini b/testing/raptor/raptor/tests/tp6/desktop/apple.ini
deleted file mode 100644
index 6ae62e597c9e956fb4a5d11e61ce01100da85375..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/apple.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-apple
-
-[DEFAULT]
-test_url = https://www.apple.com/macbook-pro/
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-apple.mp
-playback_pageset_manifest = mitm5-linux-firefox-apple.manifest
-
-[raptor-tp6-apple-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-apple-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-apple-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/bing-search.ini b/testing/raptor/raptor/tests/tp6/desktop/bing-search.ini
deleted file mode 100644
index 7e4070ff3f0d98987e0f6bef9533c4aa9735304f..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/bing-search.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-bing-search
-
-[DEFAULT]
-test_url = https://www.bing.com/search?q=barack+obama
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-bing-search.mp
-playback_pageset_manifest = mitm5-linux-firefox-bing-search.manifest
-
-[raptor-tp6-bing-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-bing-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-bing-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/cnn-ampstories.ini b/testing/raptor/raptor/tests/tp6/desktop/cnn-ampstories.ini
deleted file mode 100644
index e2437fca707ae3fac48d6fd5f0b46ddcad5d7d76..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/cnn-ampstories.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-cnn-ampstories
-
-[DEFAULT]
-test_url = https://cnn.com/ampstories/us/why-hurricane-michael-is-a-monster-unlike-any-other
-alert_threshold = 5.0
-
-[raptor-tp6-cnn-ampstories-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-alert_on = fnbpaint, fcp, dcf, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/ebay.ini b/testing/raptor/raptor/tests/tp6/desktop/ebay.ini
deleted file mode 100644
index 3cc91e4421689ed278fe587a41434aca3e61a178..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/ebay.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-ebay
-
-[DEFAULT]
-test_url = https://www.ebay.com/
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-ebay.mp
-playback_pageset_manifest = mitm5-linux-firefox-ebay.manifest
-
-[raptor-tp6-ebay-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-ebay-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-ebay-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/facebook-redesign.ini b/testing/raptor/raptor/tests/tp6/desktop/facebook-redesign.ini
deleted file mode 100644
index e38402f3a058e31a93e8a0ee71b88f4fec27ffa9..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/facebook-redesign.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-facebook-redesign
-
-[DEFAULT]
-test_url = https://www.facebook.com
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-facebook-redesign.mp
-playback_pageset_manifest = mitm5-linux-firefox-facebook-redesign.manifest
-
-[raptor-tp6-facebook-redesign-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-facebook-redesign-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-facebook-redesign-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/facebook.ini b/testing/raptor/raptor/tests/tp6/desktop/facebook.ini
deleted file mode 100644
index ae323c68e5bb47711eb66da7f7c4d3ef7de98881..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/facebook.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-facebook
-
-[DEFAULT]
-test_url = https://www.facebook.com
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-facebook.mp
-playback_pageset_manifest = mitm5-linux-firefox-facebook.manifest
-
-[raptor-tp6-facebook-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-facebook-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-facebook-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/fandom.ini b/testing/raptor/raptor/tests/tp6/desktop/fandom.ini
deleted file mode 100644
index d66ce16ec52945c8c18841771bec646bb5bc084e..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/fandom.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-fandom
-
-[DEFAULT]
-test_url = https://www.fandom.com/articles/fallout-76-will-live-and-die-on-the-creativity-of-its-playerbase
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-fandom.mp
-playback_pageset_manifest = mitm5-linux-firefox-fandom.manifest
-
-[raptor-tp6-fandom-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-fandom-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-fandom-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/google-docs.ini b/testing/raptor/raptor/tests/tp6/desktop/google-docs.ini
deleted file mode 100644
index 9c90487634455cac046a10d3d7dbddc312b1d80d..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/google-docs.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-google-docs
-
-[DEFAULT]
-test_url = https://docs.google.com/document/d/1US-07msg12slQtI_xchzYxcKlTs6Fp7WqIc6W5GK5M8/edit?usp=sharing
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-google-docs.mp
-playback_pageset_manifest = mitm5-linux-firefox-google-docs.manifest
-
-[raptor-tp6-docs-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-docs-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-docs-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/google-mail.ini b/testing/raptor/raptor/tests/tp6/desktop/google-mail.ini
deleted file mode 100644
index c4f93a36bdb4c937c10a589b4c9a0fa36b708b53..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/google-mail.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-google-mail
-
-[DEFAULT]
-test_url = https://mail.google.com/
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-google-mail.mp
-playback_pageset_manifest = mitm5-linux-firefox-google-mail.manifest
-
-[raptor-tp6-google-mail-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-google-mail-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-google-mail-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/google-search.ini b/testing/raptor/raptor/tests/tp6/desktop/google-search.ini
deleted file mode 100644
index 0e7ce5a6cfe83b70a1508c5e777e42c95fd44126..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/google-search.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-google
-
-# note: use the full url as the first part (without '&cad=h') redirects
-# to the url + '&cad=h'; that redirection causes measure.js content
-# to be loaded into that page also; resulting in 2 fnbpaint values etc.
-
-[DEFAULT]
-test_url = https://www.google.com/search?hl=en&q=barack+obama&cad=h
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-google-search.mp
-playback_pageset_manifest = mitm5-linux-firefox-google-search.manifest
-
-[raptor-tp6-google-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-google-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-google-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/google-sheets.ini b/testing/raptor/raptor/tests/tp6/desktop/google-sheets.ini
deleted file mode 100644
index 5da48320b9fbac411b322a91ff4ac67afd19130a..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/google-sheets.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-google-sheets
-
-[DEFAULT]
-test_url = https://docs.google.com/spreadsheets/d/1jT9qfZFAeqNoOK97gruc34Zb7y_Q-O_drZ8kSXT-4D4/edit?usp=sharing
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-google-sheets.mp
-playback_pageset_manifest = mitm5-linux-firefox-google-sheets.manifest
-
-[raptor-tp6-sheets-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-sheets-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-sheets-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/google-slides.ini b/testing/raptor/raptor/tests/tp6/desktop/google-slides.ini
deleted file mode 100644
index 1dbd0bbf4378450ffb51f43053ff423f375f09f1..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/google-slides.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-google-slides
-
-[DEFAULT]
-test_url = https://docs.google.com/presentation/d/1Ici0ceWwpFvmIb3EmKeWSq_vAQdmmdFcWqaiLqUkJng/edit?usp=sharing
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-google-slides.mp
-playback_pageset_manifest = mitm5-linux-firefox-google-slides.manifest
-
-[raptor-tp6-slides-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-slides-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-slides-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/imdb.ini b/testing/raptor/raptor/tests/tp6/desktop/imdb.ini
deleted file mode 100644
index fb01ec591b7479feb6bb059ca3879ebe955ef9d3..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/imdb.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-imdb
-
-[DEFAULT]
-test_url = https://www.imdb.com/title/tt0084967/?ref_=nv_sr_2
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-imdb.mp
-playback_pageset_manifest = mitm5-linux-firefox-imdb.manifest
-
-[raptor-tp6-imdb-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-imdb-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-imdb-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/imgur.ini b/testing/raptor/raptor/tests/tp6/desktop/imgur.ini
deleted file mode 100644
index ef47167aec85048623d65a867bc9dbb094f85b31..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/imgur.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-imgur
-
-[DEFAULT]
-test_url = https://imgur.com/gallery/m5tYJL6
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-imgur.mp
-playback_pageset_manifest = mitm5-linux-firefox-imgur.manifest
-
-[raptor-tp6-imgur-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-imgur-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-imgur-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/instagram.ini b/testing/raptor/raptor/tests/tp6/desktop/instagram.ini
deleted file mode 100644
index 3291951b94c15119906c01173e8dddf54d0469be..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/instagram.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-instagram
-
-[DEFAULT]
-test_url = https://www.instagram.com/
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-instagram.mp
-playback_pageset_manifest = mitm5-linux-firefox-instagram.manifest
-
-[raptor-tp6-instagram-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-instagram-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-instagram-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/linkedin.ini b/testing/raptor/raptor/tests/tp6/desktop/linkedin.ini
deleted file mode 100644
index 1cefc1b1b56494ae9515f56104d8386d93936c50..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/linkedin.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-linkedin
-
-[DEFAULT]
-test_url = https://www.linkedin.com/in/thommy-harris-hk-385723106/
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-linkedin.mp
-playback_pageset_manifest = mitm5-linux-firefox-linkedin.manifest
-
-[raptor-tp6-linkedin-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-linkedin-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-linkedin-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/microsoft.ini b/testing/raptor/raptor/tests/tp6/desktop/microsoft.ini
deleted file mode 100644
index 1500d7e4069adf205ca0b48950580e741a9d7d48..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/microsoft.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-microsoft
-
-[DEFAULT]
-test_url = https://www.microsoft.com/en-us/
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-microsoft.mp
-playback_pageset_manifest = mitm5-linux-firefox-microsoft.manifest
-
-[raptor-tp6-microsoft-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-microsoft-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-microsoft-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/netflix.ini b/testing/raptor/raptor/tests/tp6/desktop/netflix.ini
deleted file mode 100644
index 77d0f4941795c703d20878fd3b804ce8921397c6..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/netflix.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-netflix
-
-[DEFAULT]
-test_url = https://www.netflix.com/title/80117263
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-netflix.mp
-playback_pageset_manifest = mitm5-linux-firefox-netflix.manifest
-
-[raptor-tp6-netflix-firefox]
-apps = firefox
-preferences = {"media.autoplay.default": 1,
- "media.eme.enabled": true}
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-netflix-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-netflix-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/office.ini b/testing/raptor/raptor/tests/tp6/desktop/office.ini
deleted file mode 100644
index ea8e94b73e55569977cb71eab07be28573ad5493..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/office.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-office
-
-[DEFAULT]
-test_url = https://office.live.com/start/Word.aspx?omkt=en-US
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-live-office.mp
-playback_pageset_manifest = mitm5-linux-firefox-live-office.manifest
-
-[raptor-tp6-office-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-office-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-office-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/outlook.ini b/testing/raptor/raptor/tests/tp6/desktop/outlook.ini
deleted file mode 100644
index 0d6b07c1191dd904f510f38b73e96a23250c677e..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/outlook.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-outlook
-
-[DEFAULT]
-test_url = https://outlook.live.com/mail/inbox
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-live.mp
-playback_pageset_manifest = mitm5-linux-firefox-live.manifest
-
-[raptor-tp6-outlook-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-outlook-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-outlook-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/paypal.ini b/testing/raptor/raptor/tests/tp6/desktop/paypal.ini
deleted file mode 100644
index 8405949f92a77d514be80ff0e83a0e3abda85b20..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/paypal.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-paypal
-
-[DEFAULT]
-test_url = https://www.paypal.com/myaccount/summary/
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-paypal.mp
-playback_pageset_manifest = mitm5-linux-firefox-paypal.manifest
-
-[raptor-tp6-paypal-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-paypal-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-paypal-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/pinterest.ini b/testing/raptor/raptor/tests/tp6/desktop/pinterest.ini
deleted file mode 100644
index a5ad5baa6e23d25b272e9211162de4eebe0da9ec..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/pinterest.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-pinterest
-
-[DEFAULT]
-test_url = https://pinterest.com/
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-pinterest.mp
-playback_pageset_manifest = mitm5-linux-firefox-pinterest.manifest
-
-[raptor-tp6-pinterest-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-pinterest-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-pinterest-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/reddit.ini b/testing/raptor/raptor/tests/tp6/desktop/reddit.ini
deleted file mode 100644
index 4e2f864b4ba73435f0689124096a9a8f63817968..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/reddit.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-reddit
-
-[DEFAULT]
-test_url = https://www.reddit.com/r/technology/comments/9sqwyh/we_posed_as_100_senators_to_run_ads_on_facebook/
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-reddit.mp
-playback_pageset_manifest = mitm5-linux-firefox-reddit.manifest
-
-[raptor-tp6-reddit-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-reddit-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-reddit-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/tumblr.ini b/testing/raptor/raptor/tests/tp6/desktop/tumblr.ini
deleted file mode 100644
index 3c729e644f305530731453c9c52e541c3534c32e..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/tumblr.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-tumblr
-
-[DEFAULT]
-test_url = https://www.tumblr.com/dashboard
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-tumblr.mp
-playback_pageset_manifest = mitm5-linux-firefox-tumblr.manifest
-
-[raptor-tp6-tumblr-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-tumblr-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-tumblr-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/twitch.ini b/testing/raptor/raptor/tests/tp6/desktop/twitch.ini
deleted file mode 100644
index 8ad6b39f680ae2a5881d3b0c65a35bab1edb7b48..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/twitch.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-twitch
-
-[DEFAULT]
-test_url = https://www.twitch.tv/videos/326804629
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-twitch.mp
-playback_pageset_manifest = mitm5-linux-firefox-twitch.manifest
-
-[raptor-tp6-twitch-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-twitch-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-twitch-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/twitter.ini b/testing/raptor/raptor/tests/tp6/desktop/twitter.ini
deleted file mode 100644
index ca6204ac8073963c55554bcadaeb1c2846f2c09f..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/twitter.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-twitter
-
-[DEFAULT]
-test_url = https://twitter.com/BarackObama
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-twitter.mp
-playback_pageset_manifest = mitm5-linux-firefox-twitter.manifest
-
-[raptor-tp6-twitter-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-twitter-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-twitter-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/wikipedia.ini b/testing/raptor/raptor/tests/tp6/desktop/wikipedia.ini
deleted file mode 100644
index 3c400d0eced83e7c7f112eed6f70720a615f76c9..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/wikipedia.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-wikipedia
-
-[DEFAULT]
-test_url = https://en.wikipedia.org/wiki/Barack_Obama
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-wikipedia.mp
-playback_pageset_manifest = mitm5-linux-firefox-wikipedia.manifest
-
-[raptor-tp6-wikipedia-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-wikipedia-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-wikipedia-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/yahoo-mail.ini b/testing/raptor/raptor/tests/tp6/desktop/yahoo-mail.ini
deleted file mode 100644
index a99f402d7d949aa4ca721d915d9084e60e25567d..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/yahoo-mail.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-mail-firefox
-
-[DEFAULT]
-test_url = https://mail.yahoo.com/
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-yahoo-mail.mp
-playback_pageset_manifest = mitm5-linux-firefox-yahoo-mail.manifest
-
-[raptor-tp6-yahoo-mail-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-yahoo-mail-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-yahoo-mail-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/yahoo-news.ini b/testing/raptor/raptor/tests/tp6/desktop/yahoo-news.ini
deleted file mode 100644
index 0292b0430c021104fff7219fc6524ecb04442a3a..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/yahoo-news.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-yahoo-news
-
-[DEFAULT]
-test_url = https://www.yahoo.com/lifestyle/police-respond-noise-complaint-end-playing-video-games-respectful-tenants-002329963.html
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-yahoo-news.mp
-playback_pageset_manifest = mitm5-linux-firefox-yahoo-news.manifest
-
-[raptor-tp6-yahoo-news-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-yahoo-news-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-yahoo-news-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/yandex.ini b/testing/raptor/raptor/tests/tp6/desktop/yandex.ini
deleted file mode 100644
index 2d6f33a4dea9d470030294fca5ecbd82d557a6a9..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/yandex.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-yandex
-
-[DEFAULT]
-test_url = https://yandex.ru/search/?text=barack%20obama&lr=10115
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-yandex.mp
-playback_pageset_manifest = mitm5-linux-firefox-yandex.manifest
-
-[raptor-tp6-yandex-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-yandex-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-yandex-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/raptor/tests/tp6/desktop/youtube.ini b/testing/raptor/raptor/tests/tp6/desktop/youtube.ini
deleted file mode 100644
index 1fc7b90471a073b754aacb39b28ac64c136d618c..0000000000000000000000000000000000000000
--- a/testing/raptor/raptor/tests/tp6/desktop/youtube.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-youtube
-
-[DEFAULT]
-test_url = https://www.youtube.com
-playback_version = 5.1.1
-playback_recordings = mitm5-linux-firefox-youtube.mp
-playback_pageset_manifest = mitm5-linux-firefox-youtube.manifest
-
-[raptor-tp6-youtube-firefox]
-apps = firefox
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-youtube-chrome]
-apps = chrome
-measure = fcp, loadtime
-
-[raptor-tp6-youtube-chromium]
-apps = chromium
-measure = fcp, loadtime
diff --git a/testing/raptor/test/test_manifest.py b/testing/raptor/test/test_manifest.py
index 4ae47fa018b6982f4d64d75b8c8f4db5f5b589f6..46c2eb0650f5865b4c438c7442cc985b524df518 100644
--- a/testing/raptor/test/test_manifest.py
+++ b/testing/raptor/test/test_manifest.py
@@ -201,13 +201,11 @@ def test_get_raptor_test_list_geckoview(create_args):
def test_get_raptor_test_list_gecko_profiling_enabled(create_args):
- args = create_args(
- test="raptor-tp6-google-firefox", gecko_profile=True, browser_cycles=1
- )
+ args = create_args(test="amazon", gecko_profile=True, browser_cycles=1)
test_list = get_raptor_test_list(args, mozinfo.os)
assert len(test_list) == 1
- assert test_list[0]["name"] == "raptor-tp6-google-firefox"
+ assert test_list[0]["name"] == "amazon"
assert test_list[0]["gecko_profile"] is True
assert test_list[0].get("gecko_profile_entries") == "14000000"
assert test_list[0].get("gecko_profile_interval") == "1"
@@ -216,7 +214,7 @@ def test_get_raptor_test_list_gecko_profiling_enabled(create_args):
def test_get_raptor_test_list_gecko_profiling_enabled_args_override(create_args):
args = create_args(
- test="raptor-tp6-google-firefox",
+ test="amazon",
gecko_profile=True,
gecko_profile_entries=42,
gecko_profile_interval=100,
@@ -226,7 +224,7 @@ def test_get_raptor_test_list_gecko_profiling_enabled_args_override(create_args)
test_list = get_raptor_test_list(args, mozinfo.os)
assert len(test_list) == 1
- assert test_list[0]["name"] == "raptor-tp6-google-firefox"
+ assert test_list[0]["name"] == "amazon"
assert test_list[0]["gecko_profile"] is True
assert test_list[0]["gecko_profile_entries"] == "42"
assert test_list[0]["gecko_profile_interval"] == "100"
@@ -235,7 +233,7 @@ def test_get_raptor_test_list_gecko_profiling_enabled_args_override(create_args)
def test_get_raptor_test_list_gecko_profiling_disabled(create_args):
args = create_args(
- test="raptor-tp6-google-firefox",
+ test="amazon",
gecko_profile=False,
gecko_profile_entries=42,
gecko_profile_interval=100,
@@ -245,7 +243,7 @@ def test_get_raptor_test_list_gecko_profiling_disabled(create_args):
test_list = get_raptor_test_list(args, mozinfo.os)
assert len(test_list) == 1
- assert test_list[0]["name"] == "raptor-tp6-google-firefox"
+ assert test_list[0]["name"] == "amazon"
assert test_list[0].get("gecko_profile") is None
assert test_list[0].get("gecko_profile_entries") is None
assert test_list[0].get("gecko_profile_interval") is None
@@ -254,7 +252,7 @@ def test_get_raptor_test_list_gecko_profiling_disabled(create_args):
def test_get_raptor_test_list_gecko_profiling_disabled_args_override(create_args):
args = create_args(
- test="raptor-tp6-google-firefox",
+ test="amazon",
gecko_profile=False,
gecko_profile_entries=42,
gecko_profile_interval=100,
@@ -264,7 +262,7 @@ def test_get_raptor_test_list_gecko_profiling_disabled_args_override(create_args
test_list = get_raptor_test_list(args, mozinfo.os)
assert len(test_list) == 1
- assert test_list[0]["name"] == "raptor-tp6-google-firefox"
+ assert test_list[0]["name"] == "amazon"
assert test_list[0].get("gecko_profile") is None
assert test_list[0].get("gecko_profile_entries") is None
assert test_list[0].get("gecko_profile_interval") is None
@@ -272,59 +270,49 @@ def test_get_raptor_test_list_gecko_profiling_disabled_args_override(create_args
def test_get_raptor_test_list_debug_mode(create_args):
- args = create_args(
- test="raptor-tp6-google-firefox", debug_mode=True, browser_cycles=1
- )
+ args = create_args(test="amazon", debug_mode=True, browser_cycles=1)
test_list = get_raptor_test_list(args, mozinfo.os)
assert len(test_list) == 1
- assert test_list[0]["name"] == "raptor-tp6-google-firefox"
+ assert test_list[0]["name"] == "amazon"
assert test_list[0]["debug_mode"] is True
assert test_list[0]["page_cycles"] == 2
def test_get_raptor_test_list_using_live_sites(create_args):
- args = create_args(
- test="raptor-tp6-amazon-firefox", live_sites=True, browser_cycles=1
- )
+ args = create_args(test="amazon", live_sites=True, browser_cycles=1)
test_list = get_raptor_test_list(args, mozinfo.os)
assert len(test_list) == 1
- assert test_list[0]["name"] == "raptor-tp6-amazon-firefox"
+ assert test_list[0]["name"] == "amazon"
assert test_list[0]["use_live_sites"] == "true"
assert test_list[0]["playback"] is None
def test_get_raptor_test_list_override_page_cycles(create_args):
- args = create_args(
- test="raptor-tp6-google-firefox", page_cycles=99, browser_cycles=1
- )
+ args = create_args(test="amazon", page_cycles=99, browser_cycles=1)
test_list = get_raptor_test_list(args, mozinfo.os)
assert len(test_list) == 1
- assert test_list[0]["name"] == "raptor-tp6-google-firefox"
+ assert test_list[0]["name"] == "amazon"
assert test_list[0]["page_cycles"] == 99
def test_get_raptor_test_list_override_page_timeout(create_args):
- args = create_args(
- test="raptor-tp6-google-firefox", page_timeout=9999, browser_cycles=1
- )
+ args = create_args(test="amazon", page_timeout=9999, browser_cycles=1)
test_list = get_raptor_test_list(args, mozinfo.os)
assert len(test_list) == 1
- assert test_list[0]["name"] == "raptor-tp6-google-firefox"
+ assert test_list[0]["name"] == "amazon"
assert test_list[0]["page_timeout"] == 9999
def test_get_raptor_test_list_add_test_url_params(create_args):
- args = create_args(
- test="raptor-tp6-google-firefox", test_url_params="c=4", browser_cycles=1
- )
+ args = create_args(test="amazon", test_url_params="c=4", browser_cycles=1)
test_list = get_raptor_test_list(args, mozinfo.os)
assert len(test_list) == 1
- assert test_list[0]["name"] == "raptor-tp6-google-firefox"
+ assert test_list[0]["name"] == "amazon"
query_params = parse_qs(urlsplit(test_list[0]["test_url"]).query)
assert query_params.get("c") == ["4"]