Merge branch 'master' of github.com:realm/realm-core into mwb/break-u…

…p-app-baas-tests
realm · Jul 5, 2023 · 2e28256 · 2e28256
2 parents a27cfe1 + c3ea18c
commit 2e28256
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/dependencies.list b/dependencies.list
@@ -2,4 +2,4 @@ PACKAGE_NAME=realm-core
 VERSION=13.16.0
 OPENSSL_VERSION=3.0.8
 ZLIB_VERSION=1.2.13
-MDBREALM_TEST_SERVER_TAG=2023-06-13
+MDBREALM_TEST_SERVER_TAG=2023-07-03
diff --git a/evergreen/config.yml b/evergreen/config.yml
@@ -670,7 +670,7 @@ tasks:
                 export DEVELOPER_DIR="${xcode_developer_dir}"
             fi
 
-            ./evergreen/install_baas.sh -w ./baas-work-dir -b 2e23bf2f77d85f3e2fbe07e1c448e4d1cafa3a10 2>&1 | tee install_baas_output.log
+            ./evergreen/install_baas.sh -w ./baas-work-dir -b 1a0d1c021460d2215b21bc4f7c7f668714ce81c7 2>&1 | tee install_baas_output.log
         fi
 
   - command: shell.exec

diff --git a/test/object-store/sync/flx_sync.cpp b/test/object-store/sync/flx_sync.cpp
@@ -1464,7 +1464,10 @@ TEST_CASE("flx: geospatial", "[sync][flx][app][baas]") {
                             FAIL(error);
                         }
                         else {
-                            std::string_view reason = error->reason();
+                            std::string reason = std::string(error->reason());
+                            std::transform(reason.begin(), reason.end(), reason.begin(), toLowerAscii);
+                            std::transform(expected_error->begin(), expected_error->end(), expected_error->begin(),
+                                           toLowerAscii);
                             auto pos = reason.find(*expected_error);
                             if (pos == std::string::npos) {
                                 util::format(std::cout, "mismatch error: '%1' and '%2'\n", reason, *expected_error);
@@ -1551,7 +1554,7 @@ TEST_CASE("flx: geospatial", "[sync][flx][app][baas]") {
                                       "Invalid region in GEOWITHIN query for parameter 'GeoPolygon({[-80, 40.7128], "
                                       "[20, 60], [20, 20]})': 'Ring is not closed, first vertex 'GeoPoint([-80, "
                                       "40.7128])' does not equal last vertex 'GeoPoint([20, 20])''");
-                    run_query_on_server(make_polygon_filter(open_bounds), "(BadValue) Loop is not closed:");
+                    run_query_on_server(make_polygon_filter(open_bounds), "(BadValue) Loop is not closed");
                 }
                 {
                     GeoCircle circle = GeoCircle::from_kms(10, GeoPoint{-180.1, -90.1});