Fix test with new(er?) google IP address

tomaszklak · tomaszklak · commit f5ff9e8dbbca · 2024-12-10T15:15:35.000+01:00
diff --git a/bin/tests/named_tests.rs b/bin/tests/named_tests.rs
@@ -305,7 +305,7 @@ fn test_forward() {
         );
         assert_eq!(
             *response.answers()[0].data().and_then(RData::as_a).unwrap(),
-            A::new(93, 184, 216, 34)
+            A::new(93, 184, 215, 14)
         );
 
         // just tests that multiple queries work
@@ -327,7 +327,7 @@ fn test_forward() {
         );
         assert_eq!(
             *response.answers()[0].data().and_then(RData::as_a).unwrap(),
-            A::new(93, 184, 216, 34)
+            A::new(93, 184, 215, 14)
         );
         assert!(!response.header().authoritative());
     })
diff --git a/crates/async-std-resolver/src/lib.rs b/crates/async-std-resolver/src/lib.rs
@@ -66,7 +66,7 @@
 //!   //  this can return IPv4 and/or IPv6 addresses
 //!   let address = response.iter().next().expect("no addresses returned!");
 //!   if address.is_ipv4() {
-//!     assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34)));
+//!     assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14)));
 //!   } else {
 //!     assert_eq!(address, IpAddr::V6(Ipv6Addr::new(0x2606, 0x2800, 0x220, 0x1, 0x248, 0x1893, 0x25c8, 0x1946)));
 //!   }
diff --git a/crates/client/src/client/async_client.rs b/crates/client/src/client/async_client.rs
@@ -1118,15 +1118,15 @@ mod tests {
 
         // validate it's what we expected
         if let Some(RData::A(addr)) = message_returned.answers()[0].data() {
-            assert_eq!(*addr, A::new(93, 184, 216, 34));
+            assert_eq!(*addr, A::new(93, 184, 215, 14));
         }
 
         let message_parsed = Message::from_vec(&buffer)
             .expect("buffer was parsed already by AsyncClient so we should be able to do it again");
 
         // validate it's what we expected
         if let Some(RData::A(addr)) = message_parsed.answers()[0].data() {
-            assert_eq!(*addr, A::new(93, 184, 216, 34));
+            assert_eq!(*addr, A::new(93, 184, 215, 14));
         }
     }
 }
diff --git a/crates/client/src/lib.rs b/crates/client/src/lib.rs
@@ -129,7 +129,7 @@
 //! //  In order to access it we need to first check what type of record it is
 //! //  In this case we are interested in A, IPv4 address
 //! if let Some(RData::A(ref ip)) = answers[0].data() {
-//!     assert_eq!(*ip, A::new(93, 184, 216, 34))
+//!     assert_eq!(*ip, A::new(93, 184, 215, 14))
 //! } else {
 //!     assert!(false, "unexpected result")
 //! }
@@ -264,7 +264,7 @@
 //!
 //!     // validate it's what we expected
 //!     if let Some(RData::A(addr)) = response.answers()[0].data() {
-//!         assert_eq!(*addr, A::new(93, 184, 216, 34));
+//!         assert_eq!(*addr, A::new(93, 184, 215, 14));
 //!     }
 //! }
 //! ```
diff --git a/crates/proto/src/h3/h3_client_stream.rs b/crates/proto/src/h3/h3_client_stream.rs
@@ -493,7 +493,7 @@ mod tests {
             .and_then(RData::as_a)
             .expect("Expected A record");
 
-        assert_eq!(addr, &A::new(93, 184, 216, 34));
+        assert_eq!(addr, &A::new(93, 184, 215, 14));
 
         //
         // assert that the connection works for a second query
@@ -558,7 +558,7 @@ mod tests {
             .and_then(RData::as_a)
             .expect("Expected A record");
 
-        assert_eq!(addr, &A::new(93, 184, 216, 34));
+        assert_eq!(addr, &A::new(93, 184, 215, 14));
 
         //
         // assert that the connection works for a second query
@@ -625,7 +625,7 @@ mod tests {
             .and_then(RData::as_a)
             .expect("invalid response, expected A record");
 
-        assert_eq!(addr, &A::new(93, 184, 216, 34));
+        assert_eq!(addr, &A::new(93, 184, 215, 14));
 
         //
         // assert that the connection works for a second query
diff --git a/crates/resolver/examples/custom_provider.rs b/crates/resolver/examples/custom_provider.rs
@@ -64,7 +64,7 @@ async fn lookup_test<R: ConnectionProvider>(resolver: AsyncResolver<R>) {
     //  this can return IPv4 and/or IPv6 addresses
     let address = response.iter().next().expect("no addresses returned!");
     if address.is_ipv4() {
-        assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34)));
+        assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14)));
     } else {
         assert_eq!(
             address,
diff --git a/crates/resolver/src/async_resolver.rs b/crates/resolver/src/async_resolver.rs
@@ -477,7 +477,7 @@ pub mod testing {
         assert_eq!(response.iter().count(), 1);
         for address in response.iter() {
             if address.is_ipv4() {
-                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34)));
+                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14)));
             } else {
                 assert_eq!(
                     address,
@@ -592,7 +592,7 @@ pub mod testing {
         //assert_eq!(response.iter().count(), 1);
         for address in response.iter() {
             if address.is_ipv4() {
-                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34)));
+                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14)));
             } else {
                 assert_eq!(
                     address,
@@ -665,7 +665,7 @@ pub mod testing {
         assert_eq!(response.iter().count(), 2);
         for address in response.iter() {
             if address.is_ipv4() {
-                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34)));
+                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14)));
             } else {
                 assert_eq!(
                     address,
@@ -727,7 +727,7 @@ pub mod testing {
         assert_eq!(response.iter().count(), 1);
         for address in response.iter() {
             if address.is_ipv4() {
-                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34)));
+                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14)));
             } else {
                 panic!("should only be looking up IPv4");
             }
@@ -763,7 +763,7 @@ pub mod testing {
         assert_eq!(response.iter().count(), 1);
         for address in response.iter() {
             if address.is_ipv4() {
-                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34)));
+                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14)));
             } else {
                 panic!("should only be looking up IPv4");
             }
@@ -802,7 +802,7 @@ pub mod testing {
         assert_eq!(response.iter().count(), 1);
         for address in response.iter() {
             if address.is_ipv4() {
-                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34)));
+                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14)));
             } else {
                 panic!("should only be looking up IPv4");
             }
@@ -842,7 +842,7 @@ pub mod testing {
         assert_eq!(response.iter().count(), 1);
         for address in response.iter() {
             if address.is_ipv4() {
-                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34)));
+                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14)));
             } else {
                 panic!("should only be looking up IPv4");
             }
@@ -881,7 +881,7 @@ pub mod testing {
         assert_eq!(response.iter().count(), 1);
         for address in response.iter() {
             if address.is_ipv4() {
-                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34)));
+                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14)));
             } else {
                 panic!("should only be looking up IPv4");
             }
diff --git a/crates/resolver/src/lib.rs b/crates/resolver/src/lib.rs
@@ -60,7 +60,7 @@
 //! //  this can return IPv4 and/or IPv6 addresses
 //! let address = response.iter().next().expect("no addresses returned!");
 //! if address.is_ipv4() {
-//!     assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34)));
+//!     assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14)));
 //! } else {
 //!     assert_eq!(address, IpAddr::V6(Ipv6Addr::new(0x2606, 0x2800, 0x220, 0x1, 0x248, 0x1893, 0x25c8, 0x1946)));
 //! }
@@ -126,7 +126,7 @@
 //! //  this can return IPv4 and/or IPv6 addresses
 //! let address = response.iter().next().expect("no addresses returned!");
 //! if address.is_ipv4() {
-//!     assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34)));
+//!     assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14)));
 //! } else {
 //!     assert_eq!(address, IpAddr::V6(Ipv6Addr::new(0x2606, 0x2800, 0x220, 0x1, 0x248, 0x1893, 0x25c8, 0x1946)));
 //! }
diff --git a/crates/resolver/src/name_server/name_server_pool.rs b/crates/resolver/src/name_server/name_server_pool.rs
@@ -613,7 +613,7 @@ mod tests {
                 .data()
                 .and_then(RData::as_a)
                 .expect("no a record available"),
-            Ipv4Addr::new(93, 184, 216, 34).into()
+            Ipv4Addr::new(93, 184, 215, 14).into()
         );
 
         assert!(
@@ -637,7 +637,7 @@ mod tests {
                 .data()
                 .and_then(RData::as_aaaa)
                 .expect("no aaaa record available"),
-            Ipv6Addr::new(0x2606, 0x2800, 0x0220, 0x0001, 0x0248, 0x1893, 0x25c8, 0x1946).into()
+            Ipv6Addr::new(0x2606, 0x2800, 0x021f, 0xcb07, 0x6820, 0x80da, 0xaf6b, 0x8b2c).into()
         );
 
         assert!(
diff --git a/crates/resolver/src/resolver.rs b/crates/resolver/src/resolver.rs
@@ -181,7 +181,7 @@ mod tests {
         assert_eq!(response.iter().count(), 1);
         for address in response.iter() {
             if address.is_ipv4() {
-                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34)));
+                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14)));
             } else {
                 assert_eq!(
                     address,
@@ -206,7 +206,7 @@ mod tests {
         assert_eq!(response.iter().count(), 1);
         for address in response.iter() {
             if address.is_ipv4() {
-                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34)));
+                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14)));
             } else {
                 assert_eq!(
                     address,
diff --git a/crates/resolver/src/tls/mod.rs b/crates/resolver/src/tls/mod.rs
@@ -56,7 +56,7 @@ mod tests {
         assert_eq!(response.iter().count(), 1);
         for address in response.iter() {
             if address.is_ipv4() {
-                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34)));
+                assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14)));
             } else {
                 assert_eq!(
                     address,
diff --git a/crates/server/src/authority/message_response.rs b/crates/server/src/authority/message_response.rs
@@ -272,7 +272,7 @@ mod tests {
             let answer = Record::new()
                 .set_record_type(RecordType::A)
                 .set_name(Name::from_str("www.example.com.").unwrap())
-                .set_data(Some(RData::A(Ipv4Addr::new(93, 184, 216, 34).into())))
+                .set_data(Some(RData::A(Ipv4Addr::new(93, 184, 215, 14).into())))
                 .set_dns_class(DNSClass::NONE)
                 .clone();
 
@@ -309,7 +309,7 @@ mod tests {
             let answer = Record::new()
                 .set_record_type(RecordType::A)
                 .set_name(Name::from_str("www.example.com.").unwrap())
-                .set_data(Some(RData::A(Ipv4Addr::new(93, 184, 216, 34).into())))
+                .set_data(Some(RData::A(Ipv4Addr::new(93, 184, 215, 14).into())))
                 .set_dns_class(DNSClass::NONE)
                 .clone();
 
diff --git a/tests/integration-tests/src/example_authority.rs b/tests/integration-tests/src/example_authority.rs
@@ -88,7 +88,7 @@ pub fn create_example() -> InMemoryAuthority {
             .set_ttl(86400)
             .set_rr_type(RecordType::A)
             .set_dns_class(DNSClass::IN)
-            .set_data(Some(RData::A(A::new(93, 184, 216, 34))))
+            .set_data(Some(RData::A(A::new(93, 184, 215, 14))))
             .clone(),
         0,
     );
@@ -143,7 +143,7 @@ pub fn create_example() -> InMemoryAuthority {
             .set_ttl(86400)
             .set_rr_type(RecordType::A)
             .set_dns_class(DNSClass::IN)
-            .set_data(Some(RData::A(A::new(93, 184, 216, 34))))
+            .set_data(Some(RData::A(A::new(93, 184, 215, 14))))
             .clone(),
         0,
     );
diff --git a/tests/integration-tests/tests/catalog_tests.rs b/tests/integration-tests/tests/catalog_tests.rs
@@ -74,7 +74,7 @@ pub fn create_test() -> InMemoryAuthority {
             .set_ttl(86400)
             .set_rr_type(RecordType::A)
             .set_dns_class(DNSClass::IN)
-            .set_data(Some(RData::A(A::new(94, 184, 216, 34))))
+            .set_data(Some(RData::A(A::new(94, 184, 215, 14))))
             .clone(),
         0,
     );
@@ -98,7 +98,7 @@ pub fn create_test() -> InMemoryAuthority {
             .set_ttl(86400)
             .set_rr_type(RecordType::A)
             .set_dns_class(DNSClass::IN)
-            .set_data(Some(RData::A(A::new(94, 184, 216, 34))))
+            .set_data(Some(RData::A(A::new(94, 184, 215, 14))))
             .clone(),
         0,
     );
@@ -158,7 +158,7 @@ async fn test_catalog_lookup() {
     assert_eq!(answers.first().unwrap().record_type(), RecordType::A);
     assert_eq!(
         answers.first().unwrap().data().unwrap(),
-        &RData::A(A::new(93, 184, 216, 34))
+        &RData::A(A::new(93, 184, 215, 14))
     );
 
     let ns = result.name_servers();
@@ -193,7 +193,7 @@ async fn test_catalog_lookup() {
     assert_eq!(answers.first().unwrap().record_type(), RecordType::A);
     assert_eq!(
         answers.first().unwrap().data().unwrap(),
-        &RData::A(A::new(94, 184, 216, 34))
+        &RData::A(A::new(94, 184, 215, 14))
     );
 }
 
@@ -449,7 +449,7 @@ async fn test_axfr() {
             .set_ttl(86400)
             .set_rr_type(RecordType::A)
             .set_dns_class(DNSClass::IN)
-            .set_data(Some(RData::A(A::new(94, 184, 216, 34))))
+            .set_data(Some(RData::A(A::new(94, 184, 215, 14))))
             .clone(),
         Record::new()
             .set_name(origin.clone().into())
@@ -465,7 +465,7 @@ async fn test_axfr() {
             .set_ttl(86400)
             .set_rr_type(RecordType::A)
             .set_dns_class(DNSClass::IN)
-            .set_data(Some(RData::A(A::new(94, 184, 216, 34))))
+            .set_data(Some(RData::A(A::new(94, 184, 215, 14))))
             .clone(),
         Record::new()
             .set_name(www_name)
@@ -584,7 +584,7 @@ async fn test_cname_additionals() {
     assert_eq!(additionals.first().unwrap().record_type(), RecordType::A);
     assert_eq!(
         additionals.first().unwrap().data().unwrap(),
-        &RData::A(A::new(93, 184, 216, 34))
+        &RData::A(A::new(93, 184, 215, 14))
     );
 }
 
@@ -645,6 +645,6 @@ async fn test_multiple_cname_additionals() {
     assert_eq!(additionals.last().unwrap().record_type(), RecordType::A);
     assert_eq!(
         additionals.last().unwrap().data().unwrap(),
-        &RData::A(A::new(93, 184, 216, 34))
+        &RData::A(A::new(93, 184, 215, 14))
     );
 }
diff --git a/tests/integration-tests/tests/client_future_tests.rs b/tests/integration-tests/tests/client_future_tests.rs
@@ -192,7 +192,7 @@ fn test_query(client: &mut AsyncClient) -> impl Future<Output = ()> {
             assert_eq!(record.dns_class(), DNSClass::IN);
 
             if let RData::A(ref address) = record.data().unwrap() {
-                assert_eq!(address, &A::new(93, 184, 216, 34))
+                assert_eq!(address, &A::new(93, 184, 215, 14))
             } else {
                 panic!();
             }
@@ -251,7 +251,7 @@ fn test_query_edns(client: &mut AsyncClient) -> impl Future<Output = ()> {
                 &EdnsOption::Subnet("1.2.0.0/16".parse().unwrap())
             );
             if let RData::A(ref address) = *record.data().unwrap() {
-                assert_eq!(address, &A::new(93, 184, 216, 34))
+                assert_eq!(address, &A::new(93, 184, 215, 14))
             } else {
                 panic!();
             }
diff --git a/tests/integration-tests/tests/client_tests.rs b/tests/integration-tests/tests/client_tests.rs
@@ -126,7 +126,7 @@ where
     assert_eq!(record.dns_class(), DNSClass::IN);
 
     if let RData::A(ref address) = *record.data().unwrap() {
-        assert_eq!(address, &A::new(93, 184, 216, 34))
+        assert_eq!(address, &A::new(93, 184, 215, 14))
     } else {
         panic!();
     }
@@ -184,7 +184,7 @@ where
     );
 
     if let RData::A(ref address) = *record.data().unwrap() {
-        assert_eq!(address, &A::new(93, 184, 216, 34))
+        assert_eq!(address, &A::new(93, 184, 215, 14))
     } else {
         panic!();
     }
@@ -243,7 +243,7 @@ where
     assert_eq!(record.dns_class(), DNSClass::IN);
 
     if let RData::A(ref address) = *record.data().unwrap() {
-        assert_eq!(address, &A::new(93, 184, 216, 34))
+        assert_eq!(address, &A::new(93, 184, 215, 14))
     } else {
         panic!();
     }
diff --git a/tests/integration-tests/tests/dnssec_client_handle_tests.rs b/tests/integration-tests/tests/dnssec_client_handle_tests.rs
@@ -64,7 +64,7 @@ where
     assert_eq!(record.dns_class(), DNSClass::IN);
 
     if let RData::A(ref address) = *record.data().unwrap() {
-        assert_eq!(address, &A::new(93, 184, 216, 34))
+        assert_eq!(address, &A::new(93, 184, 215, 14))
     } else {
         panic!();
     }
diff --git a/tests/integration-tests/tests/lookup_tests.rs b/tests/integration-tests/tests/lookup_tests.rs
diff --git a/tests/integration-tests/tests/server_future_tests.rs b/tests/integration-tests/tests/server_future_tests.rs
diff --git a/tests/integration-tests/tests/sqlite_authority_tests.rs b/tests/integration-tests/tests/sqlite_authority_tests.rs

Original file line number	Diff line number	Diff line change
`@@ -1118,15 +1118,15 @@ mod tests {`
`1118`	`1118`
`1119`	`1119`	`// validate it's what we expected`
`1120`	`1120`	`if let Some(RData::A(addr)) = message_returned.answers()[0].data() {`
`1121`		`- assert_eq!(*addr, A::new(93, 184, 216, 34));`
	`1121`	`+ assert_eq!(*addr, A::new(93, 184, 215, 14));`
`1122`	`1122`	`}`
`1123`	`1123`
`1124`	`1124`	`let message_parsed = Message::from_vec(&buffer)`
`1125`	`1125`	`.expect("buffer was parsed already by AsyncClient so we should be able to do it again");`
`1126`	`1126`
`1127`	`1127`	`// validate it's what we expected`
`1128`	`1128`	`if let Some(RData::A(addr)) = message_parsed.answers()[0].data() {`
`1129`		`- assert_eq!(*addr, A::new(93, 184, 216, 34));`
	`1129`	`+ assert_eq!(*addr, A::new(93, 184, 215, 14));`
`1130`	`1130`	`}`
`1131`	`1131`	`}`
`1132`	`1132`	`}`