fix butterfly tests

Signed-off-by: Matt Wrock <[email protected]>
habitat-sh · Jan 31, 2024 · 6db2cba · 6db2cba
1 parent b5a8ef2
commit 6db2cba
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/components/butterfly/src/rumor/departure.rs b/components/butterfly/src/rumor/departure.rs
@@ -117,11 +117,10 @@ mod tests {
     }
 
     #[test]
-    #[should_panic(expected = "assertion failed")]
     fn departures_with_different_member_ids_are_not_equal() {
         let s1 = create_departure("mastodon");
         let s2 = create_departure("limpbizkit");
-        assert_eq!(s1, s2);
+        assert_ne!(s1, s2);
     }
 
     // Order

diff --git a/components/butterfly/src/rumor/service.rs b/components/butterfly/src/rumor/service.rs
@@ -254,29 +254,26 @@ mod tests {
     }
 
     #[test]
-    #[should_panic(expected = "assertion failed")]
     fn services_with_different_member_ids_are_not_equal() {
         let s1 = create_service("adam");
         let s2 = create_service("shanku");
-        assert_eq!(s1, s2);
+        assert_ne!(s1, s2);
     }
 
     #[test]
-    #[should_panic(expected = "assertion failed")]
     fn services_with_different_incarnations_are_not_equal() {
         let s1 = create_service("adam");
         let mut s2 = create_service("adam");
         s2.incarnation = 1;
-        assert_eq!(s1, s2);
+        assert_ne!(s1, s2);
     }
 
     #[test]
-    #[should_panic(expected = "assertion failed")]
     fn services_with_different_service_groups_are_not_equal() {
         let s1 = create_service("adam");
         let mut s2 = create_service("adam");
         s2.service_group = ServiceGroup::from_str("adam.fragile").unwrap();
-        assert_eq!(s1, s2);
+        assert_ne!(s1, s2);
     }
 
     // Order

diff --git a/components/butterfly/src/rumor/service_config.rs b/components/butterfly/src/rumor/service_config.rs
@@ -198,21 +198,19 @@ mod tests {
     }
 
     #[test]
-    #[should_panic(expected = "assertion failed")]
     fn service_configs_with_different_incarnations_are_not_equal() {
         let s1 = create_service_config("adam", "yep");
         let mut s2 = create_service_config("adam", "yep");
         s2.incarnation = 1;
-        assert_eq!(s1, s2);
+        assert_ne!(s1, s2);
     }
 
     #[test]
-    #[should_panic(expected = "assertion failed")]
     fn service_configs_with_different_service_groups_are_not_equal() {
         let s1 = create_service_config("adam", "yep");
         let mut s2 = create_service_config("adam", "yep");
         s2.service_group = ServiceGroup::from_str("adam.fragile").unwrap();
-        assert_eq!(s1, s2);
+        assert_ne!(s1, s2);
     }
 
     // Order

diff --git a/components/butterfly/src/rumor/service_file.rs b/components/butterfly/src/rumor/service_file.rs
@@ -172,21 +172,19 @@ mod tests {
     }
 
     #[test]
-    #[should_panic(expected = "assertion failed")]
     fn service_files_with_different_incarnations_are_not_equal() {
         let s1 = create_service_file("adam", "yep", "tcp-backlog = 128");
         let mut s2 = create_service_file("adam", "yep", "tcp-backlog = 128");
         s2.incarnation = 1;
-        assert_eq!(s1, s2);
+        assert_ne!(s1, s2);
     }
 
     #[test]
-    #[should_panic(expected = "assertion failed")]
     fn service_files_with_different_service_groups_are_not_equal() {
         let s1 = create_service_file("adam", "yep", "tcp-backlog = 128");
         let mut s2 = create_service_file("adam", "yep", "tcp-backlog = 128");
         s2.service_group = ServiceGroup::from_str("adam.fragile").unwrap();
-        assert_eq!(s1, s2);
+        assert_ne!(s1, s2);
     }
 
     // Order