Unittests reflect path option

python-api/gstswitch/server.py

@@ -49,7 +49,7 @@ def __init__(
         self._audio_port = None
         self._control_port = None
         self._record_file = None
-        self.gst_option_string = None
+        self.gst_option_string = ''
 
         self.path = path
         self.video_port = video_port
@@ -70,10 +70,7 @@ def path(self, path):
         """Set path
         :raises ValueError: Path cannot be left blank
         """
-        if not path:
-            raise ValueError("Path '{0}' cannot be blank".format(path))
-        else:
-            self._path = path
+        self._path = path
 
     @property
     def video_port(self):
@@ -200,7 +197,7 @@ def _run_process(self):
         """Non-public method: Runs the gst-switch-srv process
         """
         cmd = ''
-        if self.path is None:
+        if not self.path:
             srv_location = spawn.find_executable('gst-switch-srv')
             if srv_location:
                 cmd = '/'.join(srv_location.split('/')[:-1])

python-api/gstswitch/testsource.py

@@ -295,7 +295,6 @@ def make_xvimagesink(self):
         return element
 
 
-
 class VideoSrc(object):
 
     """A Test Video Source

python-api/tests/unittests/test_server_unit.py

@@ -5,8 +5,9 @@
 
 from gstswitch.server import Server
 import pytest
-from gstswitch.exception import ServerProcessError, PathError
+from gstswitch.exception import ServerProcessError
 import subprocess
+from distutils import spawn
 from mock import Mock
 
 
@@ -18,23 +19,51 @@ class TestPath(object):
     """Test the path parameter"""
     # Path Tests
 
-    def test_invalid_path(self):
-        """Test if path specified does not have executables"""
+    def test_path_provided_slash(self):
+        """Test if a path is provided"""
+        def mock_method(arg):
+            """Mocking _start_process"""
+            return arg
         path = '/usr/'
         serv = Server(path=path)
-        with pytest.raises(PathError):
-            serv.run()
+        serv._start_process = mock_method
+        assert serv._run_process().split() == "/usr/gst-switch-srv \
+--video-input-port=3000 --audio-input-port=4000 \
+--control-port=5000 --record=record.data".split()
+
+    def test_path_provided_no_slash(self):
+        """Test if a path is provided"""
+        def mock_method(arg):
+            """Mocking _start_process"""
+            return arg
+        path = '/usr'
+        serv = Server(path=path)
+        serv._start_process = mock_method
+        assert serv._run_process().split() == "/usr/gst-switch-srv \
+--video-input-port=3000 --audio-input-port=4000 \
+--control-port=5000 --record=record.data".split()
 
-    def test_invalid_path_none(self):
+    def test_path_empty(self, monkeypatch):
         """Test if null path is given"""
-        paths = [None, '', [], {}]
+
+        def mock_method(arg):
+            "Mocking _start_process"
+            return arg
+
+        def mockreturn(path):
+            "Mocking distutils.spawn.find_executable"
+            return '/usr/gst-switch-srv'
+        monkeypatch.setattr(spawn, 'find_executable', mockreturn)
+        paths = [None, '']
         for path in paths:
-            with pytest.raises(ValueError):
-                Server(path=path)
+            serv = Server(path=path)
+            serv._start_process = mock_method
+            assert serv._run_process().split() == "/usr/gst-switch-srv \
+--video-input-port=3000 --audio-input-port=4000 \
+--control-port=5000 --record=record.data".split()
 
 
 class TestVideoPort(object):
-
     """Test for video_port parameter"""
     # Video Port Tests