diff options
Diffstat (limited to 'test-cli/test')
| -rw-r--r-- | test-cli/test/helpers/camara.py | 7 | ||||
| -rw-r--r-- | test-cli/test/tests/qvideo.py | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/test-cli/test/helpers/camara.py b/test-cli/test/helpers/camara.py index afe8112..bcb1df7 100644 --- a/test-cli/test/helpers/camara.py +++ b/test-cli/test/helpers/camara.py @@ -4,6 +4,7 @@ import sh class Camara(object): __device_name = None __device = None + __setupScriptPath = '' __w = 1280 __h = 720 __contrast = 0.0 @@ -12,10 +13,11 @@ class Camara(object): __hue = 0.0 __exposure = 166 - def __init__(self, device="video0", width=1280, height=720): + def __init__(self, setup_script_path, device="video0", width=1280, height=720): self.__device_name = device self.__w = width self.__h = height + self.__setupScriptPath = setup_script_path; def Close(self): if self.__device is not None: @@ -62,7 +64,8 @@ class Camara(object): def __configure(self): self.__w = self.__setCamVar(cv2.CAP_PROP_FRAME_WIDTH, self.__w) self.__h = self.__setCamVar(cv2.CAP_PROP_FRAME_HEIGHT, self.__h) - sh.bash("../scripts/v4l-cam.sh") + sh.bash(self.__setupScriptPath + '/test/scripts/v4l-cam.sh') + # sh.bash("../scripts/v4l-cam.sh") def __setCamVar(self, key, val): valold = cv2.VideoCapture.get(self.__device, key) diff --git a/test-cli/test/tests/qvideo.py b/test-cli/test/tests/qvideo.py index e2f413e..b4133b6 100644 --- a/test-cli/test/tests/qvideo.py +++ b/test-cli/test/tests/qvideo.py @@ -16,7 +16,7 @@ class Qvideo(unittest.TestCase): self.__xmlObj = varlist["xml"] self.__QVideoName = varlist.get('name', 'qvideo') self.__resultlist = [] - self.__Camara = Camara() + self.__Camara = Camara(setup_script_path=varlist['testPath']) self.__SDL2_Test = SDL2_Test() self.__SDL2_Test.Clear() |