test(ads-client): remove flaky tests (#7044)

Author: Almaju

components/ads-client/src/instrument.rs

@@ -15,12 +15,6 @@ static DEFAULT_TELEMETRY_ENDPOINT: &str = "https://ads.mozilla.org/v1/log";
 static TELEMETRY_ENDPONT: LazyLock<RwLock<String>> =
     LazyLock::new(|| RwLock::new(DEFAULT_TELEMETRY_ENDPOINT.to_string()));
 
-#[cfg(test)]
-pub fn set_telemetry_endpoint(endpoint: String) {
-    let mut telemetry_endpoint_lock = TELEMETRY_ENDPONT.write();
-    *telemetry_endpoint_lock = endpoint;
-}
-
 fn get_telemetry_endpoint() -> String {
     TELEMETRY_ENDPONT.read().clone()
 }
@@ -69,51 +63,3 @@ pub fn emit_telemetry_event(event_type: Option<TelemetryEvent>) -> Result<(), Em
     }
     Ok(())
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::error::{CallbackRequestError, ComponentError, RecordClickError};
-    use mockito::mock;
-
-    #[test]
-    fn test_emit_telemetry_emits_telemetry_for_mappable_error() {
-        viaduct_dev::init_backend_dev();
-        set_telemetry_endpoint(format!("{}{}", mockito::server_url(), "/v1/log"));
-        let mock = mock("GET", "/v1/log")
-            .match_query(mockito::Matcher::UrlEncoded(
-                "event".into(),
-                "\"invalid_url_error\"".into(),
-            ))
-            .with_status(200)
-            .expect(1)
-            .create();
-
-        let result: Result<(), ComponentError> = Err(ComponentError::RecordClick(
-            RecordClickError::CallbackRequest(CallbackRequestError::MissingCallback {
-                message: "bad url".into(),
-            }),
-        ));
-
-        let res = result.emit_telemetry_if_error();
-
-        mock.assert();
-
-        assert!(res.is_err());
-    }
-
-    #[test]
-    fn test_emit_telemetry_event_on_ok_does_nothing() {
-        viaduct_dev::init_backend_dev();
-        set_telemetry_endpoint(format!("{}{}", mockito::server_url(), "/v1/log"));
-
-        let mock = mock("GET", "/v1/log").with_status(200).expect(0).create();
-
-        let result: Result<String, ComponentError> =
-            Ok("All is good".to_string()).emit_telemetry_if_error();
-
-        mock.assert();
-        assert!(result.is_ok());
-        assert_eq!(result.unwrap(), "All is good".to_string());
-    }
-}

components/ads-client/src/mars.rs

@@ -173,12 +173,8 @@ impl MARSClient for DefaultMARSClient {
 mod tests {
 
     use super::*;
-    use crate::{
-        http_cache::CacheMode,
-        test_utils::{
-            create_test_client, get_example_happy_ad_response, make_happy_ad_request,
-            TEST_CONTEXT_ID,
-        },
+    use crate::test_utils::{
+        create_test_client, get_example_happy_ad_response, make_happy_ad_request, TEST_CONTEXT_ID,
     };
     use mockito::mock;
     use url::Host;
@@ -295,42 +291,6 @@ mod tests {
         );
     }
 
-    #[test]
-    fn test_fetch_ads_cache_policy_respects_refresh() {
-        viaduct_dev::init_backend_dev();
-        let expected = get_example_happy_ad_response();
-        let _m = mock("POST", "/ads")
-            .with_status(200)
-            .with_header("content-type", "application/json")
-            .with_body(serde_json::to_string(&expected).unwrap())
-            .expect(2) // only first request goes to network
-            .create();
-
-        let client = create_test_client(mockito::server_url());
-        let ad_request = make_happy_ad_request();
-
-        // First call should warm the cache
-        assert_eq!(
-            client
-                .fetch_ads(&ad_request, &RequestCachePolicy::default())
-                .unwrap(),
-            expected
-        );
-        // Second call should be a network call
-        assert_eq!(
-            client
-                .fetch_ads(
-                    &ad_request,
-                    &RequestCachePolicy {
-                        mode: CacheMode::NetworkFirst,
-                        ttl_seconds: None
-                    }
-                )
-                .unwrap(),
-            expected
-        );
-    }
-
     #[test]
     fn prod_endpoint_parses_and_is_expected() {
         let url = Environment::Prod.into_mars_url();