Retry /whois to allow for propagation/persistence delay

tests/48admin.pl

@@ -31,6 +31,8 @@ sub await_purge_complete {
 test "/whois",
    requires => [ $main::API_CLIENTS[0] ],
 
+   timeout => 10,
+
    do => sub {
       my ( $http ) = @_;
 
@@ -40,30 +42,47 @@ sub await_purge_complete {
       # tightly control the actions taken by that user.
       # Conceivably this API may change based on the number of API calls the
       # user made, for instance.
+
       matrix_register_user( $http, "admin" )
       ->then( sub {
          ( $user ) = @_;
 
-         do_request_json_for( $user,
-            method => "GET",
-            uri    => "/v3/admin/whois/".$user->user_id,
-         )
-      })->then( sub {
-         my ( $body ) = @_;
+         # Synapse flushes IP addresses to the database every 5 seconds, so we
+         # need to keep checking because the IP address won't appear for a few
+         # seconds (unless the worker that flushes the IP addresses is the same
+         # as the one that handles /whois).
+         return retry_until_success sub {
+            return do_request_json_for( $user,
+               method => "GET",
+               uri    => "/v3/admin/whois/".$user->user_id,
+            )->then( sub {
+               my ( $body ) = @_;
 
-         assert_json_keys( $body, qw( devices user_id ) );
-         assert_eq( $body->{user_id}, $user->user_id, "user_id" );
-         assert_json_object( $body->{devices} );
+               assert_json_keys( $body, qw( devices user_id ) );
+               assert_eq( $body->{user_id}, $user->user_id, "user_id" );
+               assert_json_object( $body->{devices} );
 
-         foreach my $value ( values %{ $body->{devices} } ) {
-            assert_json_keys( $value, "sessions" );
-            assert_json_list( $value->{sessions} );
-            assert_json_keys( $value->{sessions}[0], "connections" );
-            assert_json_list( $value->{sessions}[0]{connections} );
-            assert_json_keys( $value->{sessions}[0]{connections}[0], qw( ip last_seen user_agent ) );
-         }
+               foreach my $value ( values %{ $body->{devices} } ) {
+                  assert_json_keys( $value, "sessions" );
+                  assert_json_list( $value->{sessions} );
+                  assert_json_keys( $value->{sessions}[0], "connections" );
+                  assert_json_list( $value->{sessions}[0]{connections} );
+                  assert_json_object( $value->{sessions}[0]{connections}[0] );
+               }
 
-         Future->done( 1 );
+               Future->done( $body->{devices} );
+            });
+         }, initial_delay => 0.5,
+            check => sub {
+               # Once the connections object is ready, check that it contains
+               # the right keys.
+               foreach my $value ( values %{ $_[0] } ) {
+                  assert_json_keys(
+                     $value->{sessions}[0]{connections}[0],
+                     qw( ip last_seen user_agent )
+                  );
+               }
+            };
       });
    };