... sync
authorVolker Birk <vb@pep-project.org>
Thu, 06 Jun 2019 20:24:36 +0200
branchsync
changeset 381479f71c45472b
parent 3813 4bcd6925d88c
child 3815 0c5bf9195005
...
sync/sync.fsm
test/src/SuiteMaker.cc
     1.1 --- a/sync/sync.fsm	Thu Jun 06 13:26:12 2019 +0200
     1.2 +++ b/sync/sync.fsm	Thu Jun 06 20:24:36 2019 +0200
     1.3 @@ -308,6 +308,9 @@
     1.4                  go End;
     1.5              }
     1.6  
     1.7 +            on CommitAccept if sameNegotiationAndPartner
     1.8 +                go HandshakingJoinPhase2;
     1.9 +
    1.10              on CommitReject if sameNegotiationAndPartner {
    1.11                  do disable;
    1.12                  go End;
     2.1 --- a/test/src/SuiteMaker.cc	Thu Jun 06 13:26:12 2019 +0200
     2.2 +++ b/test/src/SuiteMaker.cc	Thu Jun 06 20:24:36 2019 +0200
     2.3 @@ -24,7 +24,6 @@
     2.4  #include "NoOwnIdentWritesOnDecryptTests.h"
     2.5  #include "LiteralFilenameTests.h"
     2.6  #include "I18nTests.h"
     2.7 -#include "Message2_1Tests.h"
     2.8  #include "IdentityListTests.h"
     2.9  #include "PgpBinaryTests.h"
    2.10  #include "SubkeyRatingEvalTests.h"
    2.11 @@ -89,7 +88,6 @@
    2.12      "NoOwnIdentWritesOnDecryptTests",
    2.13      "LiteralFilenameTests",
    2.14      "I18nTests",
    2.15 -    "Message2_1Tests",
    2.16      "IdentityListTests",
    2.17      "PgpBinaryTests",
    2.18      "SubkeyRatingEvalTests",
    2.19 @@ -142,7 +140,7 @@
    2.20  };
    2.21  
    2.22  // This file is generated, so magic constants are ok.
    2.23 -int SuiteMaker::num_suites = 62;
    2.24 +int SuiteMaker::num_suites = 61;
    2.25  
    2.26  void SuiteMaker::suitemaker_build(const char* test_class_name, const char* test_home, Test::Suite** test_suite) {
    2.27      if (strcmp(test_class_name, "URIAddressTests") == 0)
    2.28 @@ -169,8 +167,6 @@
    2.29          *test_suite = new LiteralFilenameTests(test_class_name, test_home);
    2.30      else if (strcmp(test_class_name, "I18nTests") == 0)
    2.31          *test_suite = new I18nTests(test_class_name, test_home);
    2.32 -    else if (strcmp(test_class_name, "Message2_1Tests") == 0)
    2.33 -        *test_suite = new Message2_1Tests(test_class_name, test_home);
    2.34      else if (strcmp(test_class_name, "IdentityListTests") == 0)
    2.35          *test_suite = new IdentityListTests(test_class_name, test_home);
    2.36      else if (strcmp(test_class_name, "PgpBinaryTests") == 0)