Changed structure of files, added pytest option to makefile

python-api/Makefile

@@ -9,8 +9,11 @@ lint:
 coverage:
 	mkdir -p reports
 	mkdir -p reports/coverage
-	-py.test --cov-report html --cov gstswitch gstswitch -v
+	-py.test --cov-report html --cov gstswitch -v
 	mv htmlcov/*.* reports/coverage
 	rmdir htmlcov
 	rm *.data
 
+pytest:
+	-py.test tests/unittests -v
+

python-api/gstswitch/test_connection.py → python-api/tests/unittests/test_connection.py

@@ -1,8 +1,12 @@
-from connection import Connection
-from exception import *
+import sys
+import os
+sys.path.insert(0, os.path.abspath(os.path.join(__file__, "../../../")))
+
+from gstswitch.connection import Connection
+from gstswitch.exception import *
 import pytest
 from gi.repository import Gio, GLib
-from mock import Mock, patch
+from mock import Mock
 
 
 class TestAddress(object):

python-api/gstswitch/test_controller.py → python-api/tests/unittests/test_controller.py

@@ -1,8 +1,12 @@
-from controller import Controller
-from exception import ConnectionReturnError
+import sys
+import os
+sys.path.insert(0, os.path.abspath(os.path.join(__file__, "../../../")))
+
+from gstswitch.controller import Controller
+from gstswitch.exception import ConnectionReturnError
 import pytest
 from mock import Mock, patch
-from connection import Connection
+from gstswitch.connection import Connection
 from gi.repository import GLib
 
 

python-api/gstswitch/test_helpers.py → python-api/tests/unittests/test_helpers.py

@@ -1,7 +1,11 @@
-from helpers import TestSources, PreviewSinks
-from exception import RangeError, InvalidIndexError
+import sys
+import os
+sys.path.insert(0, os.path.abspath(os.path.join(__file__, "../../../")))
+
+from gstswitch.helpers import TestSources, PreviewSinks
+from gstswitch.exception import RangeError, InvalidIndexError
 import pytest
-import testsource
+import gstswitch.testsource
 
 
 class TestTestSourcesVideoPort(object):
@@ -50,7 +54,7 @@ def run(self):
 
     def test_new_test_video(self, monkeypatch):
         test = TestSources(video_port=3000)
-        monkeypatch.setattr(testsource, 'VideoSrc', self.MockVideoSrc)
+        monkeypatch.setattr(gstswitch.testsource, 'VideoSrc', self.MockVideoSrc)
         test.new_test_video()
         assert test.running_tests[0] is not None
         assert len(test.running_tests) != 0
@@ -137,7 +141,7 @@ def end(self):
 
     def test_run(self, monkeypatch):
         preview = PreviewSinks()
-        monkeypatch.setattr(testsource, 'Preview', self.MockPreview)
+        monkeypatch.setattr(gstswitch.testsource, 'Preview', self.MockPreview)
         preview.run()
         assert preview.preview is not None
 

python-api/gstswitch/test_server.py → python-api/tests/unittests/test_server.py

@@ -1,6 +1,10 @@
-from server import Server
+import sys
+import os
+sys.path.insert(0, os.path.abspath(os.path.join(__file__, "../../../")))
+
+from gstswitch.server import Server
 import pytest
-from exception import *
+from gstswitch.exception import *
 import os
 import subprocess
 from mock import Mock

python-api/gstswitch/test_testsource.py → python-api/tests/unittests/test_testsource.py

@@ -1,5 +1,9 @@
-from exception import RangeError
-from testsource import Preview, VideoSrc, BasePipeline, VideoPipeline
+import sys
+import os
+sys.path.insert(0, os.path.abspath(os.path.join(__file__, "../../../")))
+
+from gstswitch.exception import RangeError
+from gstswitch.testsource import Preview, VideoSrc, BasePipeline, VideoPipeline
 import pytest
 from mock import Mock, patch
 from gi.repository import Gst