Bugfix/sw 1427 fix mr beam plugin unit tests (mrbeam#1520)

* Fix test_camera

* Fix and/or comment test_undistort + corners.py

* Fix migrations test file names

* Fix test_settings

* Comment out gcodegenerator: no tests are valid

* Halfway fix the frontend tests

* Create requirements.txt for tests virtualenv

* Update README with unit test information

* Disable frontend tests

* Add missing test files

* Restore requirements.txt

* Change relative imports to absolute imports

* Change relative to absolute imports

* Change missing commits

Author: irlaec

README.md

@@ -30,3 +30,15 @@ docker run --name mrbeam-plugin -d -p5002:5000 mrbeam_plugin
 Access from the browser:
 
     http://localhost:5002
+
+
+## Running unit tests
+Create a Python 2 virtual environment and activate it:
+```shell
+virtualenv -p /usr/bin/python2.7 tests_req
+```
+
+Run the unit tests directly from **Pycharm** or from the command line:
+```shell
+python -m pytest paht/to/MrBeamPlugin/tests/
+```

octoprint_mrbeam/camera/corners.py

@@ -170,7 +170,7 @@ def get_deltas_and_refs(
     """
     pic_settings = get_corner_calibration(settings)
     if pic_settings is None:
-        return None
+        return None, None, None
 
     # Values taken from the calibration file. Used as a reference to warp the image correctly.
     # Legacy devices only have the values for the lensCorrected position.

test-requirements.txt

@@ -0,0 +1,17 @@
+# Install this in a Python2 virtualenv to run the tests
+# Tests can be run by: python -m pytest paht/to/MrBeamPlugin/tests/
+
+# The tags can be changed here (after @):
+git+https://github.com/mrbeam/[email protected]#egg=MrBeamDoc
+git+https://github.com/mrbeam/[email protected]#egg=OctoPrint
+
+mock==3.0.5
+numpy==1.16.6
+opencv-python==4.2.0.32
+Pillow==6.2.2
+pytest==4.6.11
+pytest-datafiles==2.0
+requests-mock==1.9.3
+selenium==3.141.0
+webdriver-manager==2.4.0
+

tests/camera/test_camera.py

@@ -1,17 +1,17 @@
 #!/usr/bin/env python
 import pytest
 import time
-from os.path import dirname, basename, join, split, realpath
+from os.path import dirname, join, realpath
 
 from octoprint_mrbeam.camera.exc import MrbCameraError
-from octoprint_mrbeam.camera.mrbcamera import mrbCamera, MrbCamera
+from octoprint_mrbeam.camera.mrbcamera import MrbCamera
 from octoprint_mrbeam.camera.worker import MrbPicWorker
 from octoprint.settings import settings
-from testutils.fetch_resource import fetch
+from tests.testutils.fetch_resource import fetch
 
 sett = settings(init=True)  # fix some init bug
 path = dirname(realpath(__file__))
-CAM_DIR = join(path, "rsc", "camera")
+CAM_DIR = join(path, "..", "rsc", "camera")
 
 RESOURCES = [join(CAM_DIR, "raw.jpg")]
 fetch(RESOURCES)

tests/camera/test_undistort.py

@@ -1,17 +1,18 @@
 #!/usr/bin/env python3
-
-from os.path import dirname, basename, join, split, realpath
-
-# from collections import NoneType
-
-path = dirname(realpath(__file__))
-CAM_DIR = join(path, "rsc", "camera")
+from os.path import dirname, join, realpath
 
 import pytest
 import logging
 import cv2
 import numpy as np
 from octoprint_mrbeam.camera.undistort import prepareImage
+from octoprint_mrbeam.camera.lens import BoardDetectorDaemon
+import octoprint_mrbeam.camera.lens as lens
+import time
+
+
+path = dirname(realpath(__file__))
+CAM_DIR = join(path, "..", "rsc", "camera")
 
 
 @pytest.mark.datafiles(
@@ -42,25 +43,16 @@ def test_undist(datafiles):
     assert res[5]["lens_corrected"]
 
 
-from octoprint_mrbeam.camera.lens import BoardDetectorDaemon
-import octoprint_mrbeam.camera.lens as lens
-import yaml, time
-
 BOARD_IMGS = tuple("tmp_raw_img_0%02i.jpg" % i for i in range(21, 31))
 
+
 BOARDS = pytest.mark.datafiles(
     join(CAM_DIR, "boards", "tmp_raw_img_021.jpg"),
-    join(CAM_DIR, "boards", "tmp_raw_img_021.jpg.npz"),
     join(CAM_DIR, "boards", "tmp_raw_img_022.jpg"),
-    join(CAM_DIR, "boards", "tmp_raw_img_022.jpg.npz"),
     join(CAM_DIR, "boards", "tmp_raw_img_023.jpg"),
     join(CAM_DIR, "boards", "tmp_raw_img_024.jpg"),
     join(CAM_DIR, "boards", "tmp_raw_img_025.jpg"),
     join(CAM_DIR, "boards", "tmp_raw_img_026.jpg"),
-    join(CAM_DIR, "boards", "tmp_raw_img_027.jpg"),
-    join(CAM_DIR, "boards", "tmp_raw_img_028.jpg"),
-    join(CAM_DIR, "boards", "tmp_raw_img_029.jpg"),
-    join(CAM_DIR, "boards", "tmp_raw_img_030.jpg"),
 )
 
 
@@ -127,7 +119,7 @@ def test_lens_calibration_abort(datafiles):
     #     logging.error(timeout_msg)
     #     raise
     logging.info(
-        "Joined the lens calibratior stuff - ret %s, is_alive %s", ret, b.is_alive()
+        "Joined the lens calibratior stuff - ret, is_alive %s", b.is_alive()
     )
 
 

tests/frontend/chromedriver

@@ -1,17 +1,14 @@
-import time
-import logging
+import unittest
 
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
 
-from frontend import uiUtils
-from frontend import webdriverUtils
-from frontend import gcodeUtils
-from frontend import frontendTestUtils
+from tests.frontend import webdriverUtils, gcodeUtils, frontendTestUtils, uiUtils
 
 
-class BaseProcedure:
+@unittest.skip('DEPRECATED')
+class BaseProcedure(unittest.TestCase):
     def setup_method(self, method):
 
         # expectations (None means skip)

tests/frontend/critical_designs/base_procedure.py

@@ -1,6 +1,6 @@
 import logging
-from frontend import webdriverUtils
-from frontend.critical_designs.base_procedure import BaseProcedure
+from tests.frontend import webdriverUtils
+from tests.frontend.critical_designs.base_procedure import BaseProcedure
 
 
 class TestElementsWithoutId(BaseProcedure):

tests/frontend/critical_designs/test_elements_without_id.py

@@ -1,6 +1,6 @@
 import logging
-from frontend import webdriverUtils
-from frontend.critical_designs.base_procedure import BaseProcedure
+from tests.frontend import webdriverUtils
+from tests.frontend.critical_designs.base_procedure import BaseProcedure
 
 
 class TestFillingsInDefs(BaseProcedure):

tests/frontend/critical_designs/test_fillings_in_defs.py

@@ -1,6 +1,6 @@
 import logging
-from frontend import webdriverUtils
-from frontend.critical_designs.base_procedure import BaseProcedure
+from tests.frontend import webdriverUtils
+from tests.frontend.critical_designs.base_procedure import BaseProcedure
 
 
 class TestNamespaceReferencesToEntitysOutsideTheXML(BaseProcedure):