copy the logs

docker/synapse_sytest.sh

@@ -80,12 +80,12 @@ fi
 echo >&2 "--- Copying assets"
 
 # Copy out the logs
-rsync --ignore-missing-args --min-size=1B -av server-0 server-1 /logs --include "*/" --include="*.log.*" --include="*.log" --exclude="*"
-cp /.coverage.* /src || true
+rsync --ignore-missing-args --min-size=1B -av /work/server-0 /work/server-1 /logs --include "*/" --include="*.log.*" --include="*.log" --exclude="*"
+#cp /.coverage.* /src || true
 
-cd /src
-export TOP=/src
-/venv/bin/coverage combine
+#cd /src
+#export TOP=/src
+#/venv/bin/coverage combine
 
 if [ $TEST_STATUS -ne 0 ]; then
     # Build the annotation

run-tests.pl

@@ -94,6 +94,8 @@
 
    'room-version=s' => \$TEST_ROOM_VERSION,
 
+   'tests-directory=s' => \(my $TESTS_DIRECTORY = "tests" ),
+
    # these two are superceded by -I, but kept for backwards compatibility
    'dendron=s' => sub {
       $SERVER_IMPL = 'Synapse::ViaDendron' unless $SERVER_IMPL;
@@ -188,6 +190,8 @@ sub usage
 
    --room-version VERSION       - use the given room version for the majority of
                                   tests
+
+   --tests-directory DIR        - where to tlook for the tests. Defaults to './tests'.
 .
    write STDERR;
 
@@ -819,7 +823,7 @@ sub list_symbols
          no warnings 'exiting';
          last TEST if $stop_after and $filename eq $stop_after;
       },
-      "tests"
+      $TESTS_DIRECTORY,
    );
 }
 

tests/41end-to-end-keys/08-cross-signing.pl

@@ -528,7 +528,7 @@
 
          matrix_invite_user_to_room( $user1, $user2, $room_id )
       })->then( sub {
-         matrix_sync( $user1 );
+         sync_until_user_in_device_list( $user1, $user2 );
       })->then( sub {
          matrix_join_room( $user2, $room_id );
       })->then( sub {