Backport from master:

Cosmetic changes in patch for BUG#26870329
Fixed testing framework handling of STDERR
Fixed failing AdminAPI tests due to wrong STDERR handling

Author: miguelaraujo

modules/adminapi/mod_dba_replicaset.cc

@@ -742,11 +742,10 @@ shcore::Value ReplicaSet::rejoin_instance(const shcore::Argument_list &args) {
       auto row = result->fetch_one();
       std::string member_state = row->get_value(0).as_string();
       std::string nice_error_msg = "Cannot rejoin instance '" +
-                                   instance_address + "' with state '" +
-                                   member_state +
-                                   "' since it "
-                                   "is an active member of the ReplicaSet '" +
-                                   get_member("name").as_string() + "'.";
+                                   instance_address + "' to the ReplicaSet '" +
+                                   get_member("name").as_string() +
+                                   "' since it is an active (" + member_state +
+                                   ") member of the ReplicaSet.";
       session->close(shcore::Argument_list());
       throw std::runtime_error(nice_error_msg);
     }

unittest/modules/adminapi/mod_dba_common_t.cc

@@ -1248,14 +1248,14 @@ TEST_F(Dba_common_test, validate_replicaset_group_name_002) {
 
 TEST_F(Dba_common_test, validate_instance_rejoinable_01) {
   // There are missing instances and the instance we are checking belongs to
-  // that list
+  // the metadata list but does not belong to the GR list.
 
   // get_instances_gr():
   //
   // member_id
   // ------------------------------------
+  // 8fcb92c9-5730-11e7-aa60-b86b230042b9
   // 851f0e89-5730-11e7-9e4f-b86b230042b9
-  // 8a8ae9ce-5730-11e7-a437-b86b230042b9
 
   std::vector<tests::Fake_result_data> queries;
 
@@ -1316,15 +1316,15 @@ TEST_F(Dba_common_test, validate_instance_rejoinable_01) {
 }
 
 TEST_F(Dba_common_test, validate_instance_rejoinable_02) {
-  // There are missing instances but the instance we are checking does not
-  // belong to that list.
+  // There are missing instances and the instance we are checking belongs
+  // to neither the metadata nor GR lists.
 
   // get_instances_gr():
   //
   // member_id
   // ------------------------------------
+  // 8fcb92c9-5730-11e7-aa60-b86b230042b9
   // 851f0e89-5730-11e7-9e4f-b86b230042b9
-  // 8a8ae9ce-5730-11e7-a437-b86b230042b9
 
   std::vector<tests::Fake_result_data> queries;
 
@@ -1362,9 +1362,11 @@ TEST_F(Dba_common_test, validate_instance_rejoinable_02) {
   metadata.reset(new mysqlsh::dba::MetadataStorage(md_session));
 
   std::vector<tests::Fake_result_data> instance_queries;
+  // Checking an instance that doesn't belong  to the metadata nor the GR
+  // list.
   add_get_server_variable_query(&instance_queries, "server_uuid",
                                 tests::Type::String,
-                                "8a8ae9ce-5730-11e7-a437-b86b230042b1");
+                                "aaaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaa");
   START_SERVER_MOCK(_mysql_sandbox_nport2, instance_queries);
   auto instance_session = create_session(_mysql_sandbox_nport2);
   try {
@@ -1385,7 +1387,8 @@ TEST_F(Dba_common_test, validate_instance_rejoinable_02) {
 }
 
 TEST_F(Dba_common_test, validate_instance_rejoinable_03) {
-  // There are no missing instances
+  // There are no missing instances and the instance we are checking belongs
+  // to both the metadata and GR lists.
 
   // get_instances_gr():
   //

unittest/scripts/js_devapi/scripts/dba_cluster_misconfigurations.js

@@ -46,7 +46,7 @@ var cluster = dba.createCluster('dev');
 // Regression for BUG#25966731 : ALLOW-NON-COMPATIBLE-TABLES OPTION DOES NOT EXIST
 dba.verbose = 1;
 
-//@<ERR> Create cluster fails (one table is not compatible) - verbose mode
+//@ Create cluster fails (one table is not compatible) - verbose mode
 // Regression for BUG#25966731 : ALLOW-NON-COMPATIBLE-TABLES OPTION DOES NOT EXIST
 var cluster = dba.createCluster('dev');
 

unittest/scripts/js_devapi/scripts/dba_cluster_rejoin_instance.js

@@ -75,7 +75,7 @@ wait_slave_state(cluster, uri2, "ONLINE");
 //@<OUT> Cluster status after rejoin
 cluster.status();
 
-//@ Cannot rejoin an instance that is already in the group (not missing) Bug#26870329
+//@<ERR> Cannot rejoin an instance that is already in the group (not missing) Bug#26870329
 cluster.rejoinInstance({dbUser: 'foo', host: 'localhost', port:__mysql_sandbox_port2}, {password: 'bar'});
 
 //@ Dissolve cluster

unittest/scripts/js_devapi/validation/dba_cluster_misconfigurations.js

@@ -13,17 +13,9 @@
 //@ Enable verbose
 ||
 
-//@<ERR> Create cluster fails (one table is not compatible) - verbose mode
-* Checking compliance of existing tables... FAIL
-ERROR: 1 table(s) do not have a Primary Key or Primary Key Equivalent (non-null unique key).
-	pke_test.t3
-
-Group Replication requires tables to use InnoDB and have a PRIMARY KEY or PRIMARY KEY Equivalent (non-null unique key). Tables that do not follow these requirements will be readable but not updateable when used with Group Replication. If your applications make updates (INSERT, UPDATE or DELETE) to these tables, ensure they use the InnoDB storage engine and have a PRIMARY KEY or PRIMARY KEY Equivalent.
-
-
-ERROR: Error starting cluster: The operation could not continue due to the following requirements not being met:
-Non-compatible tables found in database.
-==============================================================================
+//@ Create cluster fails (one table is not compatible) - verbose mode
+||ERROR: Error starting cluster: The operation could not continue due to the following requirements not being met:
+||Non-compatible tables found in database.
 
 //@ Disable verbose
 ||

unittest/scripts/js_devapi/validation/dba_cluster_rejoin_instance.js

@@ -84,8 +84,8 @@
     }
 }
 
-//@ Cannot rejoin an instance that is already in the group (not missing) Bug#26870329
-||Cluster.rejoinInstance: Cannot rejoin instance '<<<localhost>>>:<<<__mysql_sandbox_port2>>>' with state 'ONLINE' since it is an active member of the ReplicaSet 'default'.
+//@<ERR> Cannot rejoin an instance that is already in the group (not missing) Bug#26870329
+Cluster.rejoinInstance: Cannot rejoin instance '<<<localhost>>>:<<<__mysql_sandbox_port2>>>' to the ReplicaSet 'default' since it is an active ({{ONLINE|RECOVERING}}) member of the ReplicaSet. (RuntimeError)
 
 //@ Dissolve cluster
 ||

unittest/scripts/py_devapi/scripts/dba_cluster_misconfigurations.py

@@ -46,7 +46,7 @@
 # Regression for BUG#25966731 : ALLOW-NON-COMPATIBLE-TABLES OPTION DOES NOT EXIST
 dba.verbose = 1
 
-#@<ERR> Create cluster fails (one table is not compatible) - verbose mode
+#@ Create cluster fails (one table is not compatible) - verbose mode
 # Regression for BUG#25966731 : ALLOW-NON-COMPATIBLE-TABLES OPTION DOES NOT EXIST
 cluster = dba.create_cluster('dev')
 

unittest/scripts/py_devapi/validation/dba_cluster_misconfigurations.py

@@ -13,17 +13,9 @@
 #@ Enable verbose
 ||
 
-#@<ERR> Create cluster fails (one table is not compatible) - verbose mode
-* Checking compliance of existing tables... FAIL
-ERROR: 1 table(s) do not have a Primary Key or Primary Key Equivalent (non-null unique key).
-	pke_test.t3
-
-Group Replication requires tables to use InnoDB and have a PRIMARY KEY or PRIMARY KEY Equivalent (non-null unique key). Tables that do not follow these requirements will be readable but not updateable when used with Group Replication. If your applications make updates (INSERT, UPDATE or DELETE) to these tables, ensure they use the InnoDB storage engine and have a PRIMARY KEY or PRIMARY KEY Equivalent.
-
-
-ERROR: Error starting cluster: The operation could not continue due to the following requirements not being met:
-Non-compatible tables found in database.
-==============================================================================
+#@ Create cluster fails (one table is not compatible) - verbose mode
+||ERROR: Error starting cluster: The operation could not continue due to the following requirements not being met:
+||Non-compatible tables found in database.
 
 #@ Disable verbose
 ||

unittest/shell_js_dba_t.cc

@@ -631,6 +631,11 @@ TEST_F(Shell_js_dba_tests, cluster_no_misconfigurations_interactive) {
     "DBA: root@localhost:" + _mysql_sandbox_port1 + " : Server variable binlog_checksum was changed from 'CRC32' to 'NONE'"};
 
   MY_EXPECT_LOG_NOT_CONTAINS(log);
+  // Validate output for chunk: Create cluster fails
+  // (one table is not compatible) - verbose mode
+  // Regression for BUG#25966731 : ALLOW-NON-COMPATIBLE-TABLES OPTION DOES
+  // NOT EXIST
+  MY_EXPECT_STDOUT_NOT_CONTAINS("the --allow-non-compatible-tables option");
 }
 
 TEST_F(Shell_js_dba_tests, function_preconditions) {

unittest/shell_py_dba_t.cc

@@ -492,6 +492,11 @@ TEST_F(Shell_py_dba_tests, cluster_misconfigurations) {
     "DBA: root@localhost:" + _mysql_sandbox_port1 + " : Server variable binlog_checksum was changed from 'CRC32' to 'NONE'"};
 
   MY_EXPECT_LOG_CONTAINS(log);
+  // Validate output for chunk: Create cluster fails
+  // (one table is not compatible) - verbose mode
+  // Regression for BUG#25966731 : ALLOW-NON-COMPATIBLE-TABLES OPTION DOES
+  // NOT EXIST
+  MY_EXPECT_STDOUT_NOT_CONTAINS("the --allow-non-compatible-tables option");
 }
 
 TEST_F(Shell_py_dba_tests, cluster_misconfigurations_interactive) {

unittest/shell_script_tester.cc

@@ -186,7 +186,8 @@ bool Shell_script_tester::validate(const std::string& context, const std::string
               ADD_FAILURE();
             }
           } else {
-            ret_val = validate_line_by_line(context, chunk_id, "STDERR", error, original_std_out);
+            ret_val = validate_line_by_line(context, chunk_id, "STDERR", error,
+                                            original_std_err);
           }
         }
       }

unittest/test_utils/shell_base_test.cc

@@ -192,11 +192,15 @@ bool Shell_base_test::check_multiline_expect(const std::string& context,
   bool ret_val = true;
   auto expected_lines = shcore::split_string(expected, "\n");
   auto actual_lines = shcore::split_string(actual, "\n");
+  std::string r_trimmed_actual, r_trimmed_expected;
 
   // Identifies the index of the actual line containing the first expected line
   size_t actual_index = 0;
+  r_trimmed_expected = boost::trim_right_copy(expected_lines.at(0));
   while (actual_index < actual_lines.size()) {
-    if (actual_lines[actual_index].find(expected_lines[0]) != std::string::npos)
+    // Ignore whitespace at the end of the actual and expected lines
+    r_trimmed_actual = boost::trim_right_copy(actual_lines[actual_index]);
+    if (multi_value_compare(r_trimmed_expected, r_trimmed_actual))
       break;
     else
       actual_index++;