Fix config files for tests

TuxEatPi · Aug 31, 2016 · ccc5522 · ccc5522
1 parent feae70e
commit ccc5522
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/tests/tux/conf/tux_tests_conf_1.yaml b/tests/tux/conf/tux_tests_conf_1.yaml
@@ -6,6 +6,7 @@ tux:
         gender: male
         name: TuxDroid
     hotword:
+        answer: "yes"
         hotword: hello
         model_dir: pocketsphinx-data
     pins:

diff --git a/tests/voice/conf/voice_tests_conf_1.yaml b/tests/voice/conf/voice_tests_conf_1.yaml
@@ -2,13 +2,13 @@ tux:
     advanced:
         fake: true
         log_level: DEBUG
-    data: {}
-    hotword:
-        hotword: hello
-        model_dir: pocketsphinx-data
     global:
         gender: male
         name: TuxDroid
+    hotword:
+        answer: "yes"
+        hotword: hello
+        model_dir: pocketsphinx-data
     pins:
         wings:
             left_switch: 17

diff --git a/tuxeatpi/hotword/hotword.py b/tuxeatpi/hotword/hotword.py
@@ -23,6 +23,7 @@ def __init__(self, settings, tts_queue, logger):
         # Init private attributes
         self._settings = settings
         self._must_run = True
+        self._rerun = True
         self._config = Decoder.default_config()
         if not self.prepare_decoder():
             self._must_run = False
@@ -59,15 +60,16 @@ def prepare_decoder(self):
     def stop(self):
         """Stop process"""
         self._must_run = False
+        self._rerun = False
         self.terminate()
 
     def run(self):
         """Text to speech"""
-        rerun = True
+        self._rerun = True
         self._must_run = True
         self.logger.debug("starting listening hotword %s", self._hotword)
-        while rerun:
-            rerun = False
+        while self._rerun:
+            self._rerun = False
             self._paudio = pyaudio.PyAudio()
             stream = self._paudio.open(format=pyaudio.paInt16, channels=1, rate=16000,
                                        input=True, frames_per_buffer=1024)
@@ -82,7 +84,7 @@ def run(self):
                     self.logger.debug("Hotword detected")
                     self.tts_queue.put(gtt(self._answer))
                     # TODO run nlu audio detection
-                    rerun = True
+                    self._rerun = True
                     break
             self._decoder.end_utt()