Make retry_until_success log the reason for failure

run-tests.pl

@@ -413,20 +413,24 @@ sub delay
 }
 
 # Handy utility wrapper around Future::Utils::try_repeat_until_success which
-# includes a delay on retry
+# includes a delay on retry (and logs the reason for failure)
 sub retry_until_success(&)
 {
    my ( $code ) = @_;
 
    my $delay = 0.1;
+   my $iter = 0;
 
    try_repeat {
-      my $prev_f = shift;
-
-      ( $prev_f ?
+      ( $iter++ ?
             delay( $delay *= 1.5 ) :
             Future->done )
-         ->then( $code );
+         ->then( $code )
+         ->on_fail( sub {
+            my ( $exc ) = @_;
+            chomp $exc;
+            log_if_fail("Iteration $iter: not ready yet: $exc");
+         });
    }  until => sub { !$_[0]->failure };
 }
 

tests/30rooms/04messages.pl

@@ -400,10 +400,6 @@
                assert_deeply_eq( $chunk->[0]{content}, {}, 'chunk[0] content size' );
 
                Future->done(1);
-            })->on_fail( sub {
-               my ( $exc ) = @_;
-               chomp $exc;
-               log_if_fail "Iteration $iter: not ready yet: $exc";
             });
          }
       });

tests/30rooms/13guestaccess.pl

@@ -413,10 +413,6 @@
                }
 
                Future->done( 1 );
-            })->on_fail( sub {
-               my ( $exc ) = @_;
-               chomp $exc;
-               log_if_fail "Iteration $iter: not ready yet: $exc";
             });
          };
       })

tests/30rooms/70publicroomslist.pl

@@ -103,10 +103,6 @@
                }
 
                Future->done( 1 );
-            })->on_fail( sub {
-               my ( $exc ) = @_;
-               chomp $exc;
-               log_if_fail "Iteration $iter: not ready yet: $exc";
             });
          };
       });

tests/50federation/31room-send.pl

@@ -192,10 +192,6 @@
                assert_deeply_eq( $chunk->[0]{content}, {}, 'chunk[0] content size' );
 
                Future->done(1);
-            })->on_fail( sub {
-               my ( $exc ) = @_;
-               chomp $exc;
-               log_if_fail "Iteration $iter: not ready yet: $exc";
             });
          }
       });

tests/50federation/40publicroomlist.pl

@@ -97,10 +97,6 @@
                }
 
                Future->done(1);
-            })->on_fail(sub {
-               my ($exc) = @_;
-               chomp $exc;
-               log_if_fail "Iteration $iter: not ready yet: $exc";
             });
          };
       })