3 files changed, 6 insertions(+), 6 deletions(-)

M .github/workflows/main.yml
M source/main.cpp
M test/pytest/conftest.py

@@ 89,16 89,16 @@ jobs:
           popd
       - name: start emulator
         run: |
-          ./run_emulator_on_filesystem_image.sh 2>&1 > emulator.log &
+          rm -f /tmp/purephone_pts_name
+          ./run_emulator_on_filesystem_image.sh > emulator.log 2>&1 &
           echo $! > emulator.pid
       - name: run tests
-        run: pytest ./pytest -rP --port=simulator --timeout=20 -m 'not rt1051'
+        run: pytest ./pytest -rP -s --port=simulator --timeout=30 -m 'not rt1051'
         working-directory: test
       - name: kill emulator
         run: |
           kill $(cat emulator.pid)
           rm emulator.pid
-          rm -f /tmp/purephone_pts_name
         if: always()
       - name: print emulator logs
         run: cat emulator.log

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "config.h"


@@ 51,7 51,6 @@
 #include <memory>
 #include <vector>
 
-
 int main()
 {
 

@@ 54,7 54,8 @@ def harness(request):
     Try to init one Pure phone with serial port path or automatically
     '''
     port_name = request.config.option.port
-    TIMEOUT = min(1, request.config.option.timeout)
+    TIMEOUT = request.config.option.timeout
+
     timeout_started = time.time()
 
     RETRY_EVERY_SECONDS = 1.0