diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 91ece75063f0..83eaa7515bf6 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -7,7 +7,7 @@ padacioso~=0.2, >=0.2.1a8 adapt-parser>=1.0.0, <2.0.0 ovos-bus-client<0.1.0, >=0.0.6a10 -ovos-utils<0.1.0, ==0.0.36a8 +ovos-utils==0.0.36a9 ovos-plugin-manager<0.1.0, >=0.0.24a9 ovos-config~=0.0,>=0.0.11a13 ovos-lingua-franca>=0.4.7 diff --git a/test/unittests/common_query/test_common_query.py b/test/unittests/common_query/test_common_query.py index a1389450e844..aa150e88d827 100644 --- a/test/unittests/common_query/test_common_query.py +++ b/test/unittests/common_query/test_common_query.py @@ -42,8 +42,7 @@ def test_common_query_events(self): # thinking animation {'type': 'enclosure.mouth.think', 'data': {}, - 'context': {'destination': "skills", 'source': 'audio', - 'skill_id': self.cc.skill_id}}, + 'context': qq_ctxt}, # send query {'type': 'question:query', 'data': {'phrase': 'what is the speed of light'}, @@ -99,4 +98,8 @@ def test_common_query_events(self): for ctr, msg in enumerate(expected): m = self.bus.emitted_msgs[ctr] + if "session" in m.get("context", {}): + m["context"].pop("session") # simplify test comparisons + if "session" in msg.get("context", {}): + msg["context"].pop("session") # simplify test comparisons self.assertEqual(msg, m) diff --git a/test/unittests/common_query/test_continuous_dialog.py b/test/unittests/common_query/test_continuous_dialog.py index aa7a46cf9a7f..e6ab59c24c2f 100644 --- a/test/unittests/common_query/test_continuous_dialog.py +++ b/test/unittests/common_query/test_continuous_dialog.py @@ -11,7 +11,10 @@ def setUp(self): self.bus.emitted_msgs = [] def get_msg(msg): - self.bus.emitted_msgs.append(json.loads(msg)) + m = json.loads(msg) + if "session" in m.get("context", {}): + m["context"].pop("session") # simplify tests + self.bus.emitted_msgs.append(m) self.bus.on("message", get_msg)