From d8deed0475a5801d531e72b7e2619e18222f704f Mon Sep 17 00:00:00 2001
From: Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com>
Date: Sat, 10 Jul 2021 01:57:21 +0300
Subject: [PATCH 1/2] fix tests with tokio 1.8.1 (#2317)

---
 actix-http/src/config.rs | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/actix-http/src/config.rs b/actix-http/src/config.rs
index 0e01e8748..6661e18f3 100644
--- a/actix-http/src/config.rs
+++ b/actix-http/src/config.rs
@@ -326,7 +326,7 @@ mod notify_on_drop {
 mod tests {
     use super::*;
 
-    use actix_rt::task::yield_now;
+    use actix_rt::{task::yield_now, time::sleep};
 
     #[actix_rt::test]
     async fn test_date_service_update() {
@@ -350,7 +350,14 @@ mod tests {
         assert_ne!(buf1, buf2);
 
         drop(settings);
-        assert!(notify_on_drop::is_dropped());
+
+        // Ensure the task will drop eventually
+        let mut times = 0;
+        while !notify_on_drop::is_dropped() {
+            sleep(Duration::from_millis(100)).await;
+            times += 1;
+            assert!(times < 10, "Timeout waiting for task drop");
+        }
     }
 
     #[actix_rt::test]
@@ -372,7 +379,14 @@ mod tests {
         assert!(!notify_on_drop::is_dropped());
 
         drop(service);
-        assert!(notify_on_drop::is_dropped());
+
+        // Ensure the task will drop eventually
+        let mut times = 0;
+        while !notify_on_drop::is_dropped() {
+            sleep(Duration::from_millis(100)).await;
+            times += 1;
+            assert!(times < 10, "Timeout waiting for task drop");
+        }
     }
 
     #[test]

From 7ae132cb688c213b22878b8425e73b9431300629 Mon Sep 17 00:00:00 2001
From: CGMossa <cgmossa@gmail.com>
Date: Mon, 12 Jul 2021 03:02:19 +0200
Subject: [PATCH 2/2] Update MIGRATION.md (#2315)

Minor edit
---
 MIGRATION.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MIGRATION.md b/MIGRATION.md
index 9c29b8db9..785974366 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -5,8 +5,8 @@
   routes defined with trailing slashes will become inaccessible when
   using `NormalizePath::default()`.
   
-  Before: `#[get("/test/")`  
-  After: `#[get("/test")`  
+  Before: `#[get("/test/")]`  
+  After:  `#[get("/test")]`  
 
   Alternatively, explicitly require trailing slashes: `NormalizePath::new(TrailingSlash::Always)`.