added support for test filter similar to default test harness

Author: Andrew J Westlake

Cargo.toml

@@ -12,8 +12,9 @@ path = "pytests/test_asyncio.rs"
 harness = false
 
 [dependencies]
+clap = "2.33"
 futures = "0.3"
 lazy_static = "1.4"
 once_cell = "1.5"
-pyo3 = { git = "https://github.com/awestlake87/pyo3", branch = "finalization-bugfix" }
+pyo3 = { git = "https://github.com/awestlake87/pyo3", rev = "1ac57f7a3ca663fa4a18f8ff13ffebc39e9bd9e1" }
 tokio = { version = "0.3", features = ["full"] }

pytests/test_asyncio.rs

@@ -3,7 +3,7 @@ use std::{future::Future, thread, time::Duration};
 use futures::stream::{self};
 use pyo3::prelude::*;
 
-use pyo3_asyncio::test::{test_harness, Test};
+use pyo3_asyncio::test::{parse_args, test_harness, Test};
 
 fn dump_err<'p>(py: Python<'p>) -> impl FnOnce(PyErr) + 'p {
     move |e| {
@@ -43,14 +43,19 @@ fn test_blocking_sleep() -> PyResult<()> {
 }
 
 fn py_main(py: Python) -> PyResult<()> {
+    let args = parse_args("Pyo3 Asyncio Test Suite");
+
     pyo3_asyncio::try_init(py)?;
 
     pyo3_asyncio::run_until_complete(
         py,
-        test_harness(stream::iter(vec![
-            Test::new_async("test_async_sleep".into(), test_async_sleep(py)?),
-            Test::new_sync("test_blocking_sleep".into(), test_blocking_sleep),
-        ])),
+        test_harness(
+            stream::iter(vec![
+                Test::new_async("test_async_sleep".into(), test_async_sleep(py)?),
+                Test::new_sync("test_blocking_sleep".into(), test_blocking_sleep),
+            ]),
+            args,
+        ),
     )?;
 
     Ok(())

src/test.rs

@@ -1,8 +1,32 @@
 use std::{future::Future, pin::Pin};
 
+use clap::{App, Arg};
 use futures::stream::{Stream, StreamExt};
 use pyo3::prelude::*;
 
+pub struct Args {
+    filter: Option<String>,
+}
+
+impl Default for Args {
+    fn default() -> Self {
+        Self { filter: None }
+    }
+}
+
+pub fn parse_args(suite_name: &str) -> Args {
+    let matches = App::new(suite_name)
+        .arg(
+            Arg::with_name("TESTNAME")
+                .help("If specified, only run tests containing this string in their names"),
+        )
+        .get_matches();
+
+    Args {
+        filter: matches.value_of("TESTNAME").map(|name| name.to_string()),
+    }
+}
+
 pub struct Test {
     pub name: String,
     pub task: Pin<Box<dyn Future<Output = PyResult<()>> + Send>>,
@@ -30,11 +54,23 @@ impl Test {
     }
 }
 
-pub async fn test_harness(tests: impl Stream<Item = Test>) -> PyResult<()> {
+pub async fn test_harness(tests: impl Stream<Item = Test>, args: Args) -> PyResult<()> {
     tests
-        .for_each_concurrent(Some(4), |test| async move {
-            test.task.await.unwrap();
-            println!("test {} ... ok", test.name);
+        .for_each_concurrent(Some(4), |test| {
+            let mut ignore = false;
+
+            if let Some(filter) = args.filter.as_ref() {
+                if !test.name.contains(filter) {
+                    ignore = true;
+                }
+            }
+
+            async move {
+                if !ignore {
+                    test.task.await.unwrap();
+                    println!("test {} ... ok", test.name);
+                }
+            }
         })
         .await;