test: use individual users for Matrix clients

Author: matthiasn

.gitignore

@@ -78,3 +78,5 @@ whisper.cpp/whisper.cpp-*/
 
 # FVM Version Cache
 .fvm/
+
+integration_test/dendrite/config/jetstream/

integration_test/matrix_service_test.dart

@@ -21,26 +21,41 @@ void main() {
   group('MatrixService Tests', () {
     final mockLoggingDb = MockLoggingDb();
     final secureStorageMock = MockSecureStorage();
-    const testUserEnv = 'TEST_USER';
+    const testUserEnv1 = 'TEST_USER1';
+    const testUserEnv2 = 'TEST_USER2';
     const testServerEnv = 'TEST_SERVER';
     const testPasswordEnv = 'TEST_PASSWORD';
     const testSlowNetworkEnv = 'SLOW_NETWORK';
 
-    if (!const bool.hasEnvironment(testUserEnv)) {
-      debugPrint('TEST_USER not defined!!! Run via run_matrix_tests.sh');
+    if (!const bool.hasEnvironment(testUserEnv1)) {
+      debugPrint('TEST_USER1 not defined!!! Run via run_matrix_tests.sh');
       exit(1);
     }
-    const testUserName = String.fromEnvironment(testUserEnv);
+
+    if (!const bool.hasEnvironment(testUserEnv2)) {
+      debugPrint('TEST_USER2 not defined!!! Run via run_matrix_tests.sh');
+      exit(1);
+    }
+
+    const testUserName1 = String.fromEnvironment(testUserEnv1);
+    const testUserName2 = String.fromEnvironment(testUserEnv1);
+
     const testHomeServer = bool.hasEnvironment(testServerEnv)
         ? String.fromEnvironment(testServerEnv)
         : 'http://localhost:8008';
     const testPassword = bool.hasEnvironment(testPasswordEnv)
         ? String.fromEnvironment(testPasswordEnv)
         : '?Secret123@!';
 
-    const config = MatrixConfig(
+    const config1 = MatrixConfig(
       homeServer: testHomeServer,
-      user: testUserName,
+      user: testUserName1,
+      password: testPassword,
+    );
+
+    const config2 = MatrixConfig(
+      homeServer: testHomeServer,
+      user: testUserName2,
       password: testPassword,
     );
 
@@ -67,7 +82,7 @@ void main() {
       () async {
         debugPrint('\n--- AliceDevice goes live');
         final aliceDevice = MatrixService(
-          matrixConfig: config,
+          matrixConfig: config1,
           hiveDbName: 'AliceDevice',
           deviceDisplayName: 'AliceDevice',
         );
@@ -89,7 +104,7 @@ void main() {
 
         debugPrint('\n--- BobDevice goes live');
         final bobDevice = MatrixService(
-          matrixConfig: config,
+          matrixConfig: config2,
           hiveDbName: 'BobDevice',
           deviceDisplayName: 'BobDevice',
         );
@@ -101,14 +116,18 @@ void main() {
         final joinRes2 = await bobDevice.joinRoom(roomId);
         debugPrint('BobDevice - room joined: $joinRes2');
 
+        await Future<void>.delayed(
+          const Duration(seconds: 1 * delayFactor),
+        );
+
         await waitUntil(() => aliceDevice.getUnverified().length == 1);
         await waitUntil(() => bobDevice.getUnverified().length == 1);
 
         final unverifiedAlice = aliceDevice.getUnverified();
         final unverifiedBob = bobDevice.getUnverified();
 
-        debugPrint('AliceDevice - unverified: $unverifiedAlice');
-        debugPrint('BobDevice - unverified: $unverifiedBob');
+        debugPrint('\nAliceDevice - unverified: $unverifiedAlice');
+        debugPrint('\nBobDevice - unverified: $unverifiedBob');
 
         expect(unverifiedAlice.length, 1);
         expect(unverifiedBob.length, 1);

integration_test/run_matrix_tests.sh

@@ -1,14 +1,19 @@
 #!/bin/bash
 
 # Create user name
-uuid=$(uuidgen)
-TEST_USER="$(tr '[:upper:]' '[:lower:]' <<< "$uuid")"
+uuid1=$(uuidgen)
+uuid2=$(uuidgen)
+TEST_USER1="$(tr '[:upper:]' '[:lower:]' <<< "$uuid1")"
+TEST_USER2="$(tr '[:upper:]' '[:lower:]' <<< "$uuid2")"
 
 # Go to dendrite docker directory that contains config and keys
 cd ../dendrite/build/docker/config || exit
 
 # Create user using the create-account binary in dendrite build
-../../../bin/create-account -config dendrite.yaml -username "$TEST_USER" -admin -password "?Secret123@!"
+../../../bin/create-account -config dendrite.yaml -username "$TEST_USER1" -admin -password "?Secret123@!"
+../../../bin/create-account -config dendrite.yaml -username "$TEST_USER2" -admin -password "?Secret123@!"
 cd - > /dev/null || exit
 
-fvm flutter test integration_test/matrix_service_test.dart --dart-define=TEST_USER="@$TEST_USER:localhost"
+fvm flutter test integration_test/matrix_service_test.dart \
+    --dart-define=TEST_USER1="@$TEST_USER1:localhost" \
+    --dart-define=TEST_USER2="@$TEST_USER2:localhost"

lib/sync/matrix/matrix_service.dart

@@ -86,7 +86,7 @@ class MatrixService {
     String? hiveDbName,
   }) {
     return Client(
-      'lotti',
+      deviceDisplayName ?? 'lotti',
       verificationMethods: {
         KeyVerificationMethod.emoji,
         KeyVerificationMethod.reciprocate,

pubspec.yaml

@@ -1,7 +1,7 @@
 name: lotti
 description: Achieve your goals and keep your data private with Lotti.
 publish_to: 'none'
-version: 0.9.444+2431
+version: 0.9.445+2432
 
 msix_config:
   display_name: LottiApp