From b5750825431afe6fe227a6fcf30a593b51ceff1b Mon Sep 17 00:00:00 2001
From: Zahari Dichev <zaharidichev@gmail.com>
Date: Mon, 12 Oct 2020 19:09:36 +0300
Subject: sync: change chan `closed(&mut self)` to `closed(&self)` (#2939)

---
 tokio/src/sync/tests/loom_mpsc.rs | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

(limited to 'tokio/src/sync/tests')

diff --git a/tokio/src/sync/tests/loom_mpsc.rs b/tokio/src/sync/tests/loom_mpsc.rs
index 330e798b..c12313bd 100644
--- a/tokio/src/sync/tests/loom_mpsc.rs
+++ b/tokio/src/sync/tests/loom_mpsc.rs
@@ -2,7 +2,9 @@ use crate::sync::mpsc;
 
 use futures::future::poll_fn;
 use loom::future::block_on;
+use loom::sync::Arc;
 use loom::thread;
+use tokio_test::assert_ok;
 
 #[test]
 fn closing_tx() {
@@ -43,8 +45,8 @@ fn closing_unbounded_tx() {
 #[test]
 fn closing_bounded_rx() {
     loom::model(|| {
-        let (mut tx1, rx) = mpsc::channel::<()>(16);
-        let mut tx2 = tx1.clone();
+        let (tx1, rx) = mpsc::channel::<()>(16);
+        let tx2 = tx1.clone();
         thread::spawn(move || {
             drop(rx);
         });
@@ -54,11 +56,38 @@ fn closing_bounded_rx() {
     });
 }
 
+#[test]
+fn closing_and_sending() {
+    loom::model(|| {
+        let (tx1, mut rx) = mpsc::channel::<()>(16);
+        let tx1 = Arc::new(tx1);
+        let tx2 = tx1.clone();
+
+        let th1 = thread::spawn(move || {
+            tx1.try_send(()).unwrap();
+        });
+
+        let th2 = thread::spawn(move || {
+            block_on(tx2.closed());
+        });
+
+        let th3 = thread::spawn(move || {
+            let v = block_on(rx.recv());
+            assert!(v.is_some());
+            drop(rx);
+        });
+
+        assert_ok!(th1.join());
+        assert_ok!(th2.join());
+        assert_ok!(th3.join());
+    });
+}
+
 #[test]
 fn closing_unbounded_rx() {
     loom::model(|| {
-        let (mut tx1, rx) = mpsc::unbounded_channel::<()>();
-        let mut tx2 = tx1.clone();
+        let (tx1, rx) = mpsc::unbounded_channel::<()>();
+        let tx2 = tx1.clone();
         thread::spawn(move || {
             drop(rx);
         });
-- 
cgit v1.2.3