SEBA-394 fix unit test susceptible to side-effects
Change-Id: I277b96fb76ac4a406ce6a7aff5ae1a6c2550c0bf
diff --git a/VERSION b/VERSION
index f1592fa..8a1af3b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.28
+2.1.29
diff --git a/containers/chameleon/Dockerfile.chameleon b/containers/chameleon/Dockerfile.chameleon
index b9aa657..05afd4b 100644
--- a/containers/chameleon/Dockerfile.chameleon
+++ b/containers/chameleon/Dockerfile.chameleon
@@ -13,7 +13,7 @@
# limitations under the License.
# xosproject/chameleon
-FROM xosproject/xos-base:2.1.28
+FROM xosproject/xos-base:2.1.29
# xos-base already has protoc and dependencies installed
diff --git a/containers/xos/Dockerfile.client b/containers/xos/Dockerfile.client
index 902bc4b..ff8a605 100644
--- a/containers/xos/Dockerfile.client
+++ b/containers/xos/Dockerfile.client
@@ -13,7 +13,7 @@
# limitations under the License.
# xosproject/xos-client
-FROM xosproject/xos-libraries:2.1.28
+FROM xosproject/xos-libraries:2.1.29
# Install XOS client
COPY xos/xos_client /tmp/xos_client
diff --git a/containers/xos/Dockerfile.libraries b/containers/xos/Dockerfile.libraries
index f9ee238..5e5e117 100644
--- a/containers/xos/Dockerfile.libraries
+++ b/containers/xos/Dockerfile.libraries
@@ -13,7 +13,7 @@
# limitations under the License.
# xosproject/xos-libraries
-FROM xosproject/xos-base:2.1.28
+FROM xosproject/xos-base:2.1.29
# Add libraries
COPY lib /opt/xos/lib
diff --git a/containers/xos/Dockerfile.synchronizer-base b/containers/xos/Dockerfile.synchronizer-base
index 7329a5d..ae53613 100644
--- a/containers/xos/Dockerfile.synchronizer-base
+++ b/containers/xos/Dockerfile.synchronizer-base
@@ -13,7 +13,7 @@
# limitations under the License.
# xosproject/xos-synchronizer-base
-FROM xosproject/xos-client:2.1.28
+FROM xosproject/xos-client:2.1.29
COPY xos/synchronizers/new_base /opt/xos/synchronizers/new_base
COPY xos/xos/logger.py /opt/xos/xos/logger.py
diff --git a/containers/xos/Dockerfile.xos-core b/containers/xos/Dockerfile.xos-core
index 02fd1a3..e921bef 100644
--- a/containers/xos/Dockerfile.xos-core
+++ b/containers/xos/Dockerfile.xos-core
@@ -13,7 +13,7 @@
# limitations under the License.
# xosproject/xos-core
-FROM xosproject/xos-libraries:2.1.28
+FROM xosproject/xos-libraries:2.1.29
# Install XOS
ADD xos /opt/xos
diff --git a/xos/xos_client/xosapi/test_orm.py b/xos/xos_client/xosapi/test_orm.py
index 2f4593b..3eac9b2 100644
--- a/xos/xos_client/xosapi/test_orm.py
+++ b/xos/xos_client/xosapi/test_orm.py
@@ -637,7 +637,11 @@
with patch.object(orm.grpc_stub, "UpdateTestModel", wraps=orm.grpc_stub.UpdateTestModel) as update:
testModel.save_changed_fields()
- update.assert_called_with(ANY, metadata=[("update_fields", "intfield"), ANY])
+
+ self.assertEqual(update.call_count, 1)
+ self.assertIn("metadata", update.call_args[1])
+ update_fields_arg = [x[1] for x in update.call_args[1]["metadata"] if x[0]=="update_fields"]
+ self.assertEqual(update_fields_arg, ["intfield"])
def test_ORMWrapper_get_generic_foreignkeys(self):
""" Currently this is a placeholder that returns an empty list """