Skip to content

Commit c4c7b50

Browse files
JarbasAlJarbasAl
committed
unitests
update tests to use explicit pipelines
1 parent dfe32ff commit c4c7b50

File tree

11 files changed

+347
-62
lines changed

11 files changed

+347
-62
lines changed

‎test/end2end/routing/test_sched.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,26 @@ def test_no_session(self):
1717
SessionManager.sessions = {}
1818
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
1919
SessionManager.default_session.lang = "en-us"
20+
SessionManager.pipeline = [
21+
"stop_high",
22+
"converse",
23+
"padatious_high",
24+
"adapt_high",
25+
"fallback_high",
26+
"stop_medium",
27+
"adapt_medium",
28+
"padatious_medium",
29+
"adapt_low",
30+
"common_qa",
31+
"fallback_medium",
32+
"fallback_low"]
2033

2134
messages = []
2235

2336
def new_msg(msg):
2437
nonlocal messages
2538
m = Message.deserialize(msg)
26-
if m.msg_type in ["ovos.skills.settings_changed"]:
39+
if m.msg_type in ["ovos.skills.settings_changed", "ovos.common_play.status"]:
2740
return # skip these, only happen in 1st run
2841
messages.append(m)
2942
print(len(messages), m.msg_type, m.context.get("source"), m.context.get("destination"))

‎test/end2end/routing/test_session.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,27 @@ def test_no_session(self):
2020
SessionManager.sessions = {}
2121
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
2222
SessionManager.default_session.lang = "en-us"
23+
SessionManager.pipeline = [
24+
"stop_high",
25+
"converse",
26+
"padatious_high",
27+
"adapt_high",
28+
"fallback_high",
29+
"stop_medium",
30+
"adapt_medium",
31+
"padatious_medium",
32+
"adapt_low",
33+
"common_qa",
34+
"fallback_medium",
35+
"fallback_low"]
2336

2437
messages = []
2538

2639
def new_msg(msg):
2740
nonlocal messages
2841
m = Message.deserialize(msg)
29-
if m.msg_type in ["ovos.skills.settings_changed"]:
30-
return # skip these, only happen in 1st run
42+
if m.msg_type in ["ovos.skills.settings_changed", "ovos.common_play.status"]:
43+
return # skip these
3144
messages.append(m)
3245
print(len(messages), m.msg_type, m.context.get("source"), m.context.get("destination"))
3346

@@ -81,5 +94,3 @@ def wait_for_n_messages(n):
8194
for m in messages[3:]:
8295
self.assertEqual(m.context["source"], "B")
8396
self.assertEqual(m.context["destination"], "A")
84-
85-

‎test/end2end/session/test_complete_failure.py

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,20 @@ def test_complete_failure(self):
2121
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
2222
SessionManager.default_session.lang = "en-us"
2323
SessionManager.default_session.active_skills = [(self.skill_id, time.time())]
24+
SessionManager.default_session.pipeline = [
25+
"stop_high",
26+
"converse",
27+
"padatious_high",
28+
"adapt_high",
29+
"fallback_high",
30+
"stop_medium",
31+
"adapt_medium",
32+
"padatious_medium",
33+
"adapt_low",
34+
"common_qa",
35+
"fallback_medium",
36+
"fallback_low"
37+
]
2438
messages = []
2539

2640
def new_msg(msg):
@@ -136,6 +150,20 @@ def test_complete_failure_lang_detect(self):
136150
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
137151
SessionManager.default_session.lang = "en-us"
138152
SessionManager.default_session.active_skills = [(self.skill_id, time.time())]
153+
SessionManager.default_session.pipeline = [
154+
"stop_high",
155+
"converse",
156+
"padatious_high",
157+
"adapt_high",
158+
"fallback_high",
159+
"stop_medium",
160+
"adapt_medium",
161+
"padatious_medium",
162+
"adapt_low",
163+
"common_qa",
164+
"fallback_medium",
165+
"fallback_low"
166+
]
139167

140168
stt_lang_detect = "pt-pt"
141169

‎test/end2end/session/test_converse.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@ def test_no_session(self):
2121
SessionManager.sessions = {}
2222
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
2323
SessionManager.default_session.lang = "en-us"
24+
SessionManager.default_session.pipeline = [
25+
"converse",
26+
"padatious_high",
27+
"adapt_high",
28+
"adapt_medium",
29+
"padatious_medium",
30+
"adapt_low"
31+
]
2432

2533
messages = []
2634

‎test/end2end/session/test_fallback.py

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@ def test_fallback(self):
2020
SessionManager.sessions = {}
2121
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
2222
SessionManager.default_session.lang = "en-us"
23+
SessionManager.default_session.pipeline = [
24+
"stop_high",
25+
"converse",
26+
"padatious_high",
27+
"adapt_high",
28+
"fallback_high",
29+
"stop_medium",
30+
"adapt_medium",
31+
"padatious_medium",
32+
"adapt_low",
33+
"common_qa",
34+
"fallback_medium",
35+
"fallback_low"
36+
]
2337
messages = []
2438

2539
def new_msg(msg):
@@ -128,9 +142,36 @@ def test_fallback_with_session(self):
128142
SessionManager.sessions = {}
129143
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
130144
SessionManager.default_session.lang = "en-us"
145+
SessionManager.default_session.pipeline = [
146+
"stop_high",
147+
"converse",
148+
"padatious_high",
149+
"adapt_high",
150+
"fallback_high",
151+
"stop_medium",
152+
"adapt_medium",
153+
"padatious_medium",
154+
"adapt_low",
155+
"common_qa",
156+
"fallback_medium",
157+
"fallback_low"
158+
]
131159
messages = []
132160

133-
sess = Session()
161+
sess = Session(pipeline=[
162+
"stop_high",
163+
"converse",
164+
"padatious_high",
165+
"adapt_high",
166+
"fallback_high",
167+
"stop_medium",
168+
"adapt_medium",
169+
"padatious_medium",
170+
"adapt_low",
171+
"common_qa",
172+
"fallback_medium",
173+
"fallback_low"
174+
])
134175

135176
def new_msg(msg):
136177
nonlocal messages

‎test/end2end/session/test_fallback_v1.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@ def test_fallback_v1(self):
2020
SessionManager.sessions = {}
2121
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
2222
SessionManager.default_session.lang = "en-us"
23+
SessionManager.default_session.pipeline = [
24+
"stop_high",
25+
"converse",
26+
"padatious_high",
27+
"adapt_high",
28+
"fallback_high",
29+
"stop_medium",
30+
"adapt_medium",
31+
"padatious_medium",
32+
"adapt_low",
33+
"common_qa",
34+
"fallback_medium",
35+
"fallback_low"
36+
]
2337
messages = []
2438

2539
def new_msg(msg):

‎test/end2end/session/test_get_response.py

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,20 @@ def test_no_response(self):
2121
SessionManager.sessions = {}
2222
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
2323
SessionManager.default_session.lang = "en-us"
24+
SessionManager.default_session.pipeline = [
25+
"stop_high",
26+
"converse",
27+
"padatious_high",
28+
"adapt_high",
29+
"fallback_high",
30+
"stop_medium",
31+
"adapt_medium",
32+
"padatious_medium",
33+
"adapt_low",
34+
"common_qa",
35+
"fallback_medium",
36+
"fallback_low"
37+
]
2438

2539
messages = []
2640

@@ -160,6 +174,20 @@ def test_with_response(self):
160174
SessionManager.sessions = {}
161175
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
162176
SessionManager.default_session.lang = "en-us"
177+
SessionManager.default_session.pipeline = [
178+
"stop_high",
179+
"converse",
180+
"padatious_high",
181+
"adapt_high",
182+
"fallback_high",
183+
"stop_medium",
184+
"adapt_medium",
185+
"padatious_medium",
186+
"adapt_low",
187+
"common_qa",
188+
"fallback_medium",
189+
"fallback_low"
190+
]
163191

164192
messages = []
165193

@@ -326,6 +354,20 @@ def test_cancel_response(self):
326354
SessionManager.sessions = {}
327355
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
328356
SessionManager.default_session.lang = "en-us"
357+
SessionManager.default_session.pipeline = [
358+
"stop_high",
359+
"converse",
360+
"padatious_high",
361+
"adapt_high",
362+
"fallback_high",
363+
"stop_medium",
364+
"adapt_medium",
365+
"padatious_medium",
366+
"adapt_low",
367+
"common_qa",
368+
"fallback_medium",
369+
"fallback_low"
370+
]
329371

330372
messages = []
331373

@@ -492,6 +534,20 @@ def test_with_reprompt(self):
492534
SessionManager.sessions = {}
493535
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
494536
SessionManager.default_session.lang = "en-us"
537+
SessionManager.default_session.pipeline = [
538+
"stop_high",
539+
"converse",
540+
"padatious_high",
541+
"adapt_high",
542+
"fallback_high",
543+
"stop_medium",
544+
"adapt_medium",
545+
"padatious_medium",
546+
"adapt_low",
547+
"common_qa",
548+
"fallback_medium",
549+
"fallback_low"
550+
]
495551

496552
messages = []
497553

@@ -647,6 +703,20 @@ def test_nested(self):
647703
SessionManager.sessions = {}
648704
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
649705
SessionManager.default_session.lang = "en-us"
706+
SessionManager.default_session.pipeline = [
707+
"stop_high",
708+
"converse",
709+
"padatious_high",
710+
"adapt_high",
711+
"fallback_high",
712+
"stop_medium",
713+
"adapt_medium",
714+
"padatious_medium",
715+
"adapt_low",
716+
"common_qa",
717+
"fallback_medium",
718+
"fallback_low"
719+
]
650720

651721
messages = []
652722

‎test/end2end/session/test_sched.py

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,20 @@ def test_no_session(self):
1717
SessionManager.sessions = {}
1818
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
1919
SessionManager.default_session.lang = "en-us"
20+
SessionManager.default_session.pipeline = [
21+
"stop_high",
22+
"converse",
23+
"padatious_high",
24+
"adapt_high",
25+
"fallback_high",
26+
"stop_medium",
27+
"adapt_medium",
28+
"padatious_medium",
29+
"adapt_low",
30+
"common_qa",
31+
"fallback_medium",
32+
"fallback_low"
33+
]
2034

2135
messages = []
2236

@@ -127,6 +141,20 @@ def test_explicit_session(self):
127141
SessionManager.sessions = {}
128142
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
129143
SessionManager.default_session.lang = "en-us"
144+
SessionManager.default_session.pipeline = [
145+
"stop_high",
146+
"converse",
147+
"padatious_high",
148+
"adapt_high",
149+
"fallback_high",
150+
"stop_medium",
151+
"adapt_medium",
152+
"padatious_medium",
153+
"adapt_low",
154+
"common_qa",
155+
"fallback_medium",
156+
"fallback_low"
157+
]
130158

131159
messages = []
132160

@@ -148,7 +176,20 @@ def wait_for_n_messages(n):
148176

149177
self.core.bus.on("message", new_msg)
150178

151-
sess = Session()
179+
sess = Session(pipeline=[
180+
"stop_high",
181+
"converse",
182+
"padatious_high",
183+
"adapt_high",
184+
"fallback_high",
185+
"stop_medium",
186+
"adapt_medium",
187+
"padatious_medium",
188+
"adapt_low",
189+
"common_qa",
190+
"fallback_medium",
191+
"fallback_low"
192+
])
152193
utt = Message("recognizer_loop:utterance",
153194
{"utterances": ["schedule event"]},
154195
{"session": sess.serialize()})

0 commit comments

Comments
 (0)