From a9ac69fe9cbcca53a5646d8cb5c89a7dfbfcda1d Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sun, 16 Feb 2020 00:55:13 +0100
Subject: [PATCH] fix pinning test by forcing a reliable order

---
 src/chat.rs | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/chat.rs b/src/chat.rs
index 745739a34..91fc16a82 100644
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -2898,25 +2898,26 @@ mod tests {
     #[test]
     fn test_pinned() {
         let t = dummy_context();
+
+        // create 3 chats, wait 1 second in between to get a reliable order (we order by time)
         let mut msg = Message::new(Viewtype::Text);
         msg.text = Some("foo".to_string());
         let msg_id = add_device_msg(&t.ctx, None, Some(&mut msg)).unwrap();
         let chat_id1 = message::Message::load_from_db(&t.ctx, msg_id)
             .unwrap()
             .chat_id;
+        std::thread::sleep(std::time::Duration::from_millis(1000));
         let chat_id2 = create_by_contact_id(&t.ctx, DC_CONTACT_ID_SELF).unwrap();
+        std::thread::sleep(std::time::Duration::from_millis(1000));
         let chat_id3 = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "foo").unwrap();
 
         let chatlist = get_chats_from_chat_list(&t.ctx, DC_GCL_NO_SPECIALS);
-        assert_eq!(chatlist, vec![chat_id3, chat_id1, chat_id2]);
+        assert_eq!(chatlist, vec![chat_id3, chat_id2, chat_id1]);
 
         // pin
-        assert!(
-            chat_id1
-                .set_visibility(&t.ctx, ChatVisibility::Pinned)
-                .is_ok()
-                == true
-        );
+        assert!(chat_id1
+            .set_visibility(&t.ctx, ChatVisibility::Pinned)
+            .is_ok());
         assert_eq!(
             Chat::load_from_db(&t.ctx, chat_id1)
                 .unwrap()
@@ -2929,12 +2930,9 @@ mod tests {
         assert_eq!(chatlist, vec![chat_id1, chat_id3, chat_id2]);
 
         // unpin
-        assert!(
-            chat_id1
-                .set_visibility(&t.ctx, ChatVisibility::Normal)
-                .is_ok()
-                == true
-        );
+        assert!(chat_id1
+            .set_visibility(&t.ctx, ChatVisibility::Normal)
+            .is_ok());
         assert_eq!(
             Chat::load_from_db(&t.ctx, chat_id1)
                 .unwrap()
@@ -2944,7 +2942,7 @@ mod tests {
 
         // check if chat order changed back
         let chatlist = get_chats_from_chat_list(&t.ctx, DC_GCL_NO_SPECIALS);
-        assert_eq!(chatlist, vec![chat_id3, chat_id1, chat_id2]);
+        assert_eq!(chatlist, vec![chat_id3, chat_id2, chat_id1]);
     }
 
     #[test]