Merge pull request #1526 from matrix-org/andy/crypto_tests

Enable more crypto integration tests
matrix-org · Jul 18, 2022 · b83b814 · b83b814
2 parents ae50268 + 422bf6d
commit b83b814
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 19 deletions.
diff --git a/MatrixSDKTests/MXCrossSigningTests.m b/MatrixSDKTests/MXCrossSigningTests.m
@@ -423,7 +423,7 @@ - (void)testRefreshState
  XCTAssertFalse(newAliceSession.crypto.crossSigning.canCrossSign);
 
  // - Let's wait for the magic of gossip to happen
- dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 2 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
 
  // -> Cross-signing should be fully enabled
  XCTAssertEqual(newAliceSession.crypto.crossSigning.state, MXCrossSigningStateCanCrossSign);
@@ -989,7 +989,6 @@ - (void)testTrustChain
 
  NSString *bobUserId = bobSession.myUserId;
  NSString *bobDeviceId = bobSession.myDeviceId;
-
 
  // - Alice self-verifies it with Alice2
  // This simulates a self verification and trigger cross-signing behind the shell
@@ -998,7 +997,7 @@ - (void)testTrustChain
  [aliceSession3.crypto setUserVerification:YES forUser:aliceUserId success:^{
 
  // Wait a bit to make background requests for cross-signing happen
- dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 2 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
 
  // -> Alice3 should see all devices in the party as trusted thanks to cross-signing
  XCTAssertEqual(aliceSession3.crypto.crossSigning.state, MXCrossSigningStateCanCrossSign);
@@ -1015,12 +1014,12 @@ - (void)testTrustChain
 
  // -> Alice3 should see Bob as trusted thanks to cross-signing
  [aliceSession3.crypto downloadKeys:@[bobUserId] forceDownload:NO success:^(MXUsersDevicesMap<MXDeviceInfo *> *usersDevicesInfoMap, NSDictionary<NSString *,MXCrossSigningInfo *> *crossSigningKeysMap) {
- 
+
  XCTAssertTrue([aliceSession3.crypto trustLevelForUser:bobUserId].isCrossSigningVerified);
  XCTAssertTrue([aliceSession3.crypto deviceTrustLevelForDevice:bobDeviceId ofUser:bobUserId].isCrossSigningVerified);
- 
+
  [expectation fulfill];
- 
+
  } failure:^(NSError *error) {
  XCTFail(@"Cannot set up intial test conditions - error: %@", error);
  [expectation fulfill];
@@ -1227,7 +1226,8 @@ - (void)testMXCrossSigningResetDetection
 // - Reset XS on this new device
 // - Restart Alice first device
 // -> Alice first device must not trust the cross-signing anymore
-- (void)testMXCrossSigningResetDetectionAfterRestart
+// TODO: test is currently broken
+- (void)xtestMXCrossSigningResetDetectionAfterRestart
 {
  // - Have Alice with cross-signing
  [self doTestWithBobAndBootstrappedAlice:self readyToTest:^(MXSession *bobSession, MXSession *aliceSession, NSString *roomId, XCTestExpectation *expectation) {

diff --git a/MatrixSDKTests/MXCryptoKeyVerificationTests.m b/MatrixSDKTests/MXCryptoKeyVerificationTests.m
@@ -230,10 +230,12 @@ - (void)checkVerificationByToDeviceFullFlowWithBobSession:(MXSession*)bobSession
 
  // - Alice gets the requests notification
  [self observeKeyVerificationRequestInSession:aliceSession block:^(MXKeyVerificationRequest * _Nullable requestFromAlicePOV) {
+ XCTAssertNotNil(requestFromAlicePOV.requestId);
+ XCTAssertNotNil(requestId);
  XCTAssertEqualObjects(requestFromAlicePOV.requestId, requestId);
 
  // Wait a bit
- dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
 
  XCTAssertEqualObjects(requestFromAlicePOV.methods, methods);
  XCTAssertEqualObjects(requestFromAlicePOV.otherMethods, methods);
@@ -383,7 +385,8 @@ - (void)testVerificationByToDeviceFullFlowWithAliceWith2Devices
 /**
  Same tests as testVerificationByToDeviceFullFlow but with bob with 2 sessions
  */
-- (void)testVerificationByToDeviceFullFlowWith2Devices
+// TODO: Test currently broken
+- (void)xtestVerificationByToDeviceFullFlowWith2Devices
 {
  // - Alice and Bob are in a room
  [matrixSDKTestsE2EData doE2ETestWithAliceAndBobInARoom:self cryptedBob:YES warnOnUnknowDevices:YES aliceStore:[[MXMemoryStore alloc] init] bobStore:[[MXMemoryStore alloc] init] readyToTest:^(MXSession *aliceSession, MXSession *bobSession, NSString *roomId, XCTestExpectation *expectation) {
@@ -398,7 +401,8 @@ - (void)testVerificationByToDeviceFullFlowWith2Devices
 /**
  Same tests as testVerificationByToDeviceFullFlow but with only alice verifying her 2 devices.
  */
-- (void)testVerificationByToDeviceSelfVerificationFullFlow
+// TODO: Test currently broken
+- (void)xtestVerificationByToDeviceSelfVerificationFullFlow
 {
  // - Alice and Bob are in a room
  [matrixSDKTestsE2EData doE2ETestWithAliceAndBobInARoom:self cryptedBob:YES warnOnUnknowDevices:YES aliceStore:[[MXMemoryStore alloc] init] bobStore:[[MXMemoryStore alloc] init] readyToTest:^(MXSession *aliceSession, MXSession *bobSession, NSString *roomId, XCTestExpectation *expectation) {
@@ -948,7 +952,8 @@ - (void)testVerificationByDMRequests
 /**
  Nomical case: The full flow
  */
-- (void)testVerificationByDMFullFlow
+// TODO: test is currently broken
+- (void)xtestVerificationByDMFullFlow
 {
  // - Alice and Bob are in a room
  [matrixSDKTestsE2EData doE2ETestWithAliceAndBobInARoom:self cryptedBob:YES warnOnUnknowDevices:YES aliceStore:[[MXMemoryStore alloc] init] bobStore:[[MXMemoryStore alloc] init] readyToTest:^(MXSession *aliceSession, MXSession *bobSession, NSString *roomId, XCTestExpectation *expectation) {

diff --git a/MatrixSDKTests/MXCryptoShareTests.m b/MatrixSDKTests/MXCryptoShareTests.m
@@ -141,7 +141,8 @@ - (void)createScenario:(void (^)(MXSession *aliceSession, NSString *roomId, MXMe
  -> Key share requests must be pending
  -> Then, they must have been sent
  */
-- (void)testKeyShareRequestFromNewDevice
+// TODO: Test currently broken
+- (void)xtestKeyShareRequestFromNewDevice
 {
  // - Have Alice and Bob in e2ee room with messages
  [matrixSDKTestsE2EData doE2ETestWithAliceAndBobInARoomWithCryptedMessages:self cryptedBob:YES readyToTest:^(MXSession *aliceSession1, MXSession *bobSession, NSString *roomId, XCTestExpectation *expectation) {
@@ -212,6 +213,11 @@ - (void)testNominalCase
 
  // - Alice2 pagingates in the room
  MXRoom *roomFromAlice2POV = [aliceSession2 roomWithRoomId:roomId];
+ if (!roomFromAlice2POV) {
+ XCTFail(@"Failed to fetch room");
+ [expectation fulfill];
+ }
+
  [roomFromAlice2POV liveTimeline:^(id<MXEventTimeline> liveTimeline) {
  [liveTimeline resetPagination];
  [liveTimeline paginate:10 direction:MXTimelineDirectionBackwards onlyFromStore:NO complete:^{
@@ -220,7 +226,7 @@ - (void)testNominalCase
  XCTAssertNotNil([aliceSession2.crypto.store outgoingRoomKeyRequestWithState:MXRoomKeyRequestStateUnsent]);
 
  // Wait a bit
- dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
 
  // -> After a bit, Alice2 should have received all keys
  XCTAssertEqual(aliceSession2.crypto.store.inboundGroupSessions.count, aliceSession1.crypto.store.inboundGroupSessions.count);
@@ -263,7 +269,8 @@ - (void)testNominalCase
  - Enable key share requests on Alice2
  -> Key share requests should have complete
  */
-- (void)testDisableKeyShareRequest
+// TODO: test currently broken
+- (void)xtestDisableKeyShareRequest
 {
  // - Have Alice and Bob in e2ee room with messages
  [matrixSDKTestsE2EData doE2ETestWithAliceAndBobInARoomWithCryptedMessages:self cryptedBob:YES readyToTest:^(MXSession *aliceSession1, MXSession *bobSession, NSString *roomId, XCTestExpectation *expectation) {
@@ -292,7 +299,7 @@ - (void)testDisableKeyShareRequest
  [liveTimeline paginate:10 direction:MXTimelineDirectionBackwards onlyFromStore:NO complete:^{
 
  // Wait a bit
- dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
 
  // -> Key share requests must be pending
  XCTAssertNotNil([aliceSession2.crypto.store outgoingRoomKeyRequestWithState:MXRoomKeyRequestStateUnsent]);
@@ -345,7 +352,8 @@ - (void)testDisableKeyShareRequest
  -> key share requests on Alice2 are enabled again
  -> No m.room_key_request have been made
  */
-- (void)testNoKeyShareRequestIfThereIsABackup
+// TODO: Test currently broken
+- (void)xtestNoKeyShareRequestIfThereIsABackup
 {
  // - Have Alice and Bob in e2ee room with messages
  [matrixSDKTestsE2EData doE2ETestWithAliceAndBobInARoomWithCryptedMessages:self cryptedBob:YES readyToTest:^(MXSession *aliceSession1, MXSession *bobSession, NSString *roomId, XCTestExpectation *expectation) {
@@ -721,7 +729,7 @@ - (void)testSharedHistoryPreservedWhenForwardingKeys
  [liveTimeline resetPagination];
  [liveTimeline paginate:10 direction:MXTimelineDirectionBackwards onlyFromStore:NO complete:^{
 
- dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
 
  // Alice2 now has all 3 keys, despite only two of them having shared history
  XCTAssertEqual([self numberOfKeysInSession:aliceSession2], 3);

diff --git a/MatrixSDKTests/TestPlans/CryptoTests.xctestplan b/MatrixSDKTests/TestPlans/CryptoTests.xctestplan
@@ -29,9 +29,11 @@
  "testTargets" : [
  {
  "selectedTests" : [
+ "MXCrossSigningTests",
+ "MXCrossSigningVerificationTests",
+ "MXCryptoKeyVerificationTests",
  "MXCryptoSecretStorageTests",
- "MXCryptoShareTests\/testShareHistoryKeysWithInvitedUser",
- "MXCryptoShareTests\/testSharedHistoryPreservedWhenForwardingKeys",
+ "MXCryptoShareTests",
  "MXCryptoTests",
  "MXMegolmEncryptionTests"
  ],