Merge #455

455: test: split off common_tests from common r=koivunej a=koivunej

Tiny refactoring to stop testing `common::tests` as part of every top level `test/*.rs`, noticed during #454.

Co-authored-by: Joonas Koivunen <joonas.koivunen@gmail.com>

Author: bors[bot]

tests/common/mod.rs

@@ -61,54 +61,3 @@ pub async fn spawn_nodes(count: usize, topology: Topology) -> Vec<Node> {
 
     nodes
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    const N: usize = 5;
-
-    #[tokio::test]
-    async fn check_topology_line() {
-        let nodes = spawn_nodes(N, Topology::Line).await;
-
-        for (i, node) in nodes.iter().enumerate() {
-            if i == 0 || i == N - 1 {
-                assert_eq!(node.peers().await.unwrap().len(), 1);
-            } else {
-                assert_eq!(node.peers().await.unwrap().len(), 2);
-            }
-        }
-    }
-
-    #[tokio::test]
-    async fn check_topology_ring() {
-        let nodes = spawn_nodes(N, Topology::Ring).await;
-
-        for node in &nodes {
-            assert_eq!(node.peers().await.unwrap().len(), 2);
-        }
-    }
-
-    #[tokio::test]
-    async fn check_topology_mesh() {
-        let nodes = spawn_nodes(N, Topology::Mesh).await;
-
-        for node in &nodes {
-            assert_eq!(node.peers().await.unwrap().len(), N - 1);
-        }
-    }
-
-    #[tokio::test]
-    async fn check_topology_star() {
-        let nodes = spawn_nodes(N, Topology::Star).await;
-
-        for (i, node) in nodes.iter().enumerate() {
-            if i == 0 {
-                assert_eq!(node.peers().await.unwrap().len(), N - 1);
-            } else {
-                assert_eq!(node.peers().await.unwrap().len(), 1);
-            }
-        }
-    }
-}

tests/common_tests.rs

@@ -0,0 +1,51 @@
+mod common;
+use common::{spawn_nodes, Topology};
+
+// these tests are here instead of being under common/mod.rs so that they wont be executed as part
+// of every `test/` case which includes `mod common;`.
+
+const N: usize = 5;
+
+#[tokio::test]
+async fn check_topology_line() {
+    let nodes = spawn_nodes(N, Topology::Line).await;
+
+    for (i, node) in nodes.iter().enumerate() {
+        if i == 0 || i == N - 1 {
+            assert_eq!(node.peers().await.unwrap().len(), 1);
+        } else {
+            assert_eq!(node.peers().await.unwrap().len(), 2);
+        }
+    }
+}
+
+#[tokio::test]
+async fn check_topology_ring() {
+    let nodes = spawn_nodes(N, Topology::Ring).await;
+
+    for node in &nodes {
+        assert_eq!(node.peers().await.unwrap().len(), 2);
+    }
+}
+
+#[tokio::test]
+async fn check_topology_mesh() {
+    let nodes = spawn_nodes(N, Topology::Mesh).await;
+
+    for node in &nodes {
+        assert_eq!(node.peers().await.unwrap().len(), N - 1);
+    }
+}
+
+#[tokio::test]
+async fn check_topology_star() {
+    let nodes = spawn_nodes(N, Topology::Star).await;
+
+    for (i, node) in nodes.iter().enumerate() {
+        if i == 0 {
+            assert_eq!(node.peers().await.unwrap().len(), N - 1);
+        } else {
+            assert_eq!(node.peers().await.unwrap().len(), 1);
+        }
+    }
+}