[PBCKP-236] final update after review

Ivan Lazarev · Ivan Lazarev · commit 1ce38ed70ccc · 2022-09-28T04:52:11.000+03:00
diff --git a/src/utils/remote.c b/src/utils/remote.c
@@ -310,12 +310,9 @@ size_t prepare_compatibility_str(char* compatibility_buf, size_t compatibility_b
 	};
 
 	size_t result_size = 0;
-	size_t compatibility_params_array_size = sizeof compatibility_params / sizeof compatibility_params[0];;
-
 	*compatibility_buf = '\0';
-	Assert(compatibility_params_array_size % 2 == 0);
 
-	for (int i = 0; i < compatibility_params_array_size; i+=2)
+	for (int i = 0; i < sizeof compatibility_params; i+=2)
 	{
 		if (compatibility_params[i].strval != NULL)
 			result_size += snprintf(compatibility_buf + result_size, compatibility_buf_size - result_size,
@@ -366,7 +363,7 @@ void check_remote_agent_compatibility(int agent_version, char *compatibility_str
 		prepare_compatibility_str(buf, sizeof buf);
 		if(strcmp(compatibility_str, buf))
 		{
-			elog(ERROR, "Incompatible remote agent params, expected:\n%s, actual:\n:%s ", buf, compatibility_str);
+			elog(ERROR, "Incompatible remote agent params, expected:\n%s, actual:\n:%s", buf, compatibility_str);
 		}
 	}
 }
diff --git a/tests/compatibility.py b/tests/compatibility.py
@@ -14,7 +14,7 @@ def setUp(self):
         self.fname = self.id().split('.')[3]
 
     # @unittest.expectedFailure
-    @unittest.skip("skip")
+    # @unittest.skip("skip")
     def test_catchup_with_different_remote_major_pg(self):
         """
         Decription in jira issue PBCKP-236

Original file line number	Diff line number	Diff line change
`@@ -310,12 +310,9 @@ size_t prepare_compatibility_str(char* compatibility_buf, size_t compatibility_b`
`310`	`310`	`};`
`311`	`311`
`312`	`312`	`size_t result_size = 0;`
`313`		`- size_t compatibility_params_array_size = sizeof compatibility_params / sizeof compatibility_params[0];;`
`314`		`-`
`315`	`313`	`*compatibility_buf = '\0';`
`316`		`- Assert(compatibility_params_array_size % 2 == 0);`
`317`	`314`
`318`		`- for (int i = 0; i < compatibility_params_array_size; i+=2)`
	`315`	`+ for (int i = 0; i < sizeof compatibility_params; i+=2)`
`319`	`316`	`{`
`320`	`317`	`if (compatibility_params[i].strval != NULL)`
`321`	`318`	`result_size += snprintf(compatibility_buf + result_size, compatibility_buf_size - result_size,`
`@@ -366,7 +363,7 @@ void check_remote_agent_compatibility(int agent_version, char *compatibility_str`
`366`	`363`	`prepare_compatibility_str(buf, sizeof buf);`
`367`	`364`	`if(strcmp(compatibility_str, buf))`
`368`	`365`	`{`
`369`		`- elog(ERROR, "Incompati 8000 ble remote agent params, expected:\n%s, actual:\n:%s ", buf, compatibility_str);`
	`366`	`+ elog(ERROR, "Incompatible remote agent params, expected:\n%s, actual:\n:%s", buf, compatibility_str);`
`370`	`367`	`}`
`371`	`368`	`}`
`372`	`369`	`}`