Merge pull request redis-rs#378 from mibes404/master

Break the loop after processing the initial results, when cursor == None

Author: Marwes

src/cmd.rs

@@ -110,6 +110,8 @@ impl<'a, T: FromRedisValue + 'a> AsyncIter<'a, T> {
                 if cursor == 0 {
                     return None;
                 }
+            } else {
+                return None;
             }
 
             let rv = unwrap_or!(

tests/test_async.rs

@@ -226,16 +226,15 @@ fn test_transaction_multiplexed_connection() {
     .unwrap();
 }
 
-#[test]
-fn test_async_scanning() {
+fn test_async_scanning(batch_size: usize) {
     let ctx = TestContext::new();
     block_on_all(async move {
         ctx.multiplexed_async_connection()
             .and_then(|mut con| {
                 async move {
                     let mut unseen = std::collections::HashSet::new();
 
-                    for x in 0..1000 {
+                    for x in 0..batch_size {
                         redis::cmd("SADD")
                             .arg("foo")
                             .arg(x)
@@ -255,7 +254,8 @@ fn test_async_scanning() {
                     while let Some(x) = iter.next_item().await {
                         // type inference limitations
                         let x: usize = x;
-                        unseen.remove(&x);
+                        // if this assertion fails, too many items were returned by the iterator.
+                        assert!(unseen.remove(&x));
                     }
 
                     assert_eq!(unseen.len(), 0);
@@ -268,6 +268,16 @@ fn test_async_scanning() {
     .unwrap();
 }
 
+#[test]
+fn test_async_scanning_big_batch() {
+    test_async_scanning(1000)
+}
+
+#[test]
+fn test_async_scanning_small_batch() {
+    test_async_scanning(2)
+}
+
 #[test]
 #[cfg(feature = "script")]
 fn test_script() {