More coverage improvements (#137)

More experiments with coverage.

Author: dagwieers

.coveragerc

@@ -1,3 +1,6 @@
+[report]
+omit = test/
+
 [run]
 branch = true
 omit = test/

lib/inputstreamhelper.py

@@ -226,22 +226,31 @@ def _cmd_exists(cmd):
         # https://stackoverflow.com/questions/377017/test-if-executable-exists-in-python
         return subprocess.call('type ' + cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) == 0
 
-    @staticmethod
-    def _helper_disabled():
+    def _helper_disabled(self):
         """Return if inputstreamhelper has been disabled in settings.xml."""
         disabled = ADDON.getSetting('disabled')
-        if not disabled:
-            ADDON.setSetting('disabled', 'false')  # create default entry
-            disabled = 'false'
+        if disabled is None:
+            self.disable()  # Create default entry
+            disabled = 'true'
 
         if disabled == 'true':
             log('inputstreamhelper is disabled in settings.xml.')
             return True
 
-        log('inputstreamhelper is enabled. You can disable inputstreamhelper by setting \"disabled\" to \"true\" in settings.xml \
-        (Note: only recommended for developers knowing what they\'re doing!)')
         return False
 
+    @staticmethod
+    def disable():
+        ''' Disable plugin '''
+        if ADDON.getSetting('disabled') == 'false':
+            ADDON.setSetting('disabled', 'true')
+
+    @staticmethod
+    def enable():
+        ''' Enable plugin '''
+        if ADDON.getSetting('disabled') == 'true':
+            ADDON.setSetting('disabled', 'false')
+
     def _inputstream_version(self):
         ''' Return the requested inputstream version '''
         addon = xbmcaddon.Addon(self.inputstream_addon)

pylintrc

@@ -7,4 +7,5 @@ disable=
     redundant-keyword-arg,
     too-many-branches,
     too-many-instance-attributes,
+    too-many-lines,
     too-many-return-statements,

test/test_ishelper_android_arm.py

@@ -3,6 +3,7 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 import unittest
+import platform
 import inputstreamhelper
 
 xbmc = __import__('xbmc')
@@ -15,24 +16,33 @@ class AndroidARMTests(unittest.TestCase):
 
     def test_check_inputstream_mpd(self):
         inputstreamhelper.system_os = lambda: 'Android'
+        platform.machine = lambda: 'arm'
         is_helper = inputstreamhelper.Helper('mpd', drm='com.widevine.alpha')
-        is_helper._arch = lambda: 'arm'
         is_helper.remove_widevine()
         is_installed = is_helper.check_inputstream()
         self.assertTrue(is_installed, True)
 
-    def test_check_inputstream_mpd_again(self):
+    def test_check_inputstream_hls_again(self):
         inputstreamhelper.system_os = lambda: 'Android'
-        is_helper = inputstreamhelper.Helper('mpd', drm='com.widevine.alpha')
-        is_helper._arch = lambda: 'arm'
+        platform.machine = lambda: 'armv7'
+        is_helper = inputstreamhelper.Helper('hls', drm='com.widevine.alpha')
         is_installed = is_helper.check_inputstream()
         self.assertTrue(is_installed, True)
 
     def test_check_inputstream_rtmp(self):
         inputstreamhelper.system_os = lambda: 'Android'
-        is_helper = inputstreamhelper.Helper('rtmp', drm='com.widevine.alpha')
-        is_helper._arch = lambda: 'arm'
+        platform.machine = lambda: 'armv8'
+        is_helper = inputstreamhelper.Helper('rtmp')
+        is_installed = is_helper.check_inputstream()
+        self.assertTrue(is_installed, True)
+
+    def test_check_inputstream_disabled(self):
+        inputstreamhelper.system_os = lambda: 'Android'
+        platform.machine = lambda: 'arm'
+        is_helper = inputstreamhelper.Helper('mpd', drm='com.widevine.alpha')
+        is_helper.disable()
         is_installed = is_helper.check_inputstream()
+        is_helper.enable()
         self.assertTrue(is_installed, True)
 
 

test/test_ishelper_linux_arm.py

@@ -3,6 +3,7 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 import unittest
+import platform
 import inputstreamhelper
 
 xbmc = __import__('xbmc')
@@ -15,24 +16,33 @@ class LinuxARMTests(unittest.TestCase):
 
     def test_check_inputstream_mpd(self):
         inputstreamhelper.system_os = lambda: 'Linux'
+        platform.machine = lambda: 'arm'
         is_helper = inputstreamhelper.Helper('mpd', drm='com.widevine.alpha')
-        is_helper._arch = lambda: 'arm'
         is_helper.remove_widevine()
         is_installed = is_helper.check_inputstream()
         self.assertTrue(is_installed, True)
 
-    def test_check_inputstream_mpd_again(self):
+    def test_check_inputstream_hls_again(self):
         inputstreamhelper.system_os = lambda: 'Linux'
-        is_helper = inputstreamhelper.Helper('mpd', drm='com.widevine.alpha')
-        is_helper._arch = lambda: 'arm'
+        platform.machine = lambda: 'armv7'
+        is_helper = inputstreamhelper.Helper('hls', drm='com.widevine.alpha')
         is_installed = is_helper.check_inputstream()
         self.assertTrue(is_installed, True)
 
     def test_check_inputstream_rtmp(self):
         inputstreamhelper.system_os = lambda: 'Linux'
-        is_helper = inputstreamhelper.Helper('rtmp', drm='com.widevine.alpha')
-        is_helper._arch = lambda: 'arm'
+        platform.machine = lambda: 'armv8'
+        is_helper = inputstreamhelper.Helper('rtmp')
+        is_installed = is_helper.check_inputstream()
+        self.assertTrue(is_installed, True)
+
+    def test_check_inputstream_disabled(self):
+        inputstreamhelper.system_os = lambda: 'Linux'
+        platform.machine = lambda: 'arm'
+        is_helper = inputstreamhelper.Helper('mpd', drm='com.widevine.alpha')
+        is_helper.disable()
         is_installed = is_helper.check_inputstream()
+        is_helper.enable()
         self.assertTrue(is_installed, True)
 
 

test/test_ishelper_linux_x64.py

@@ -3,6 +3,7 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 import unittest
+import platform
 import inputstreamhelper
 
 xbmc = __import__('xbmc')
@@ -15,24 +16,34 @@ class LinuxX64Tests(unittest.TestCase):
 
     def test_check_inputstream_mpd(self):
         inputstreamhelper.system_os = lambda: 'Linux'
+        platform.machine = lambda: 'x86_64'
         is_helper = inputstreamhelper.Helper('mpd', drm='com.widevine.alpha')
-        is_helper._arch = lambda: 'x86_64'
         is_helper.remove_widevine()
         is_installed = is_helper.check_inputstream()
         self.assertTrue(is_installed, True)
 
-    def test_check_inputstream_mpd_again(self):
+    def test_check_inputstream_hls_again(self):
         inputstreamhelper.system_os = lambda: 'Linux'
-        is_helper = inputstreamhelper.Helper('mpd', drm='com.widevine.alpha')
-        is_helper._arch = lambda: 'x86_64'
+        platform.machine = lambda: 'AMD64'
+        platform.architecture = lambda: ['64bit', '']
+        is_helper = inputstreamhelper.Helper('hls', drm='com.widevine.alpha')
         is_installed = is_helper.check_inputstream()
         self.assertTrue(is_installed, True)
 
     def test_check_inputstream_rtmp(self):
         inputstreamhelper.system_os = lambda: 'Linux'
-        is_helper = inputstreamhelper.Helper('rtmp', drm='com.widevine.alpha')
-        is_helper._arch = lambda: 'x86_64'
+        platform.machine = lambda: 'x86_64'
+        is_helper = inputstreamhelper.Helper('rtmp')
+        is_installed = is_helper.check_inputstream()
+        self.assertTrue(is_installed, True)
+
+    def test_check_inputstream_disabled(self):
+        inputstreamhelper.system_os = lambda: 'Linux'
+        platform.machine = lambda: 'x86_64'
+        is_helper = inputstreamhelper.Helper('mpd', drm='com.widevine.alpha')
+        is_helper.disable()
         is_installed = is_helper.check_inputstream()
+        is_helper.enable()
         self.assertTrue(is_installed, True)
 
 

test/test_ishelper_macos_x64.py

@@ -3,6 +3,7 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 import unittest
+import platform
 import inputstreamhelper
 
 xbmc = __import__('xbmc')
@@ -15,24 +16,34 @@ class DarwinX64Tests(unittest.TestCase):
 
     def test_check_inputstream_mpd(self):
         inputstreamhelper.system_os = lambda: 'Darwin'
+        platform.machine = lambda: 'x86_64'
         is_helper = inputstreamhelper.Helper('mpd', drm='com.widevine.alpha')
-        is_helper._arch = lambda: 'x86_64'
         is_helper.remove_widevine()
         is_installed = is_helper.check_inputstream()
         self.assertTrue(is_installed, True)
 
-    def test_check_inputstream_mpd_again(self):
+    def test_check_inputstream_hls_again(self):
         inputstreamhelper.system_os = lambda: 'Darwin'
-        is_helper = inputstreamhelper.Helper('mpd', drm='com.widevine.alpha')
-        is_helper._arch = lambda: 'x86_64'
+        platform.machine = lambda: 'AMD64'
+        platform.architecture = lambda: ['64bit', '']
+        is_helper = inputstreamhelper.Helper('hls', drm='com.widevine.alpha')
         is_installed = is_helper.check_inputstream()
         self.assertTrue(is_installed, True)
 
     def test_check_inputstream_rtmp(self):
         inputstreamhelper.system_os = lambda: 'Darwin'
-        is_helper = inputstreamhelper.Helper('rtmp', drm='com.widevine.alpha')
-        is_helper._arch = lambda: 'x86_64'
+        platform.machine = lambda: 'x86_64'
+        is_helper = inputstreamhelper.Helper('rtmp')
+        is_installed = is_helper.check_inputstream()
+        self.assertTrue(is_installed, True)
+
+    def test_check_inputstream_disabled(self):
+        inputstreamhelper.system_os = lambda: 'Darwin'
+        platform.machine = lambda: 'x86_64'
+        is_helper = inputstreamhelper.Helper('mpd', drm='com.widevine.alpha')
+        is_helper.disable()
         is_installed = is_helper.check_inputstream()
+        is_helper.enable()
         self.assertTrue(is_installed, True)
 
 

test/test_ishelper_windows_x64.py

@@ -3,6 +3,7 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 import unittest
+import platform
 import inputstreamhelper
 
 xbmc = __import__('xbmc')
@@ -15,24 +16,34 @@ class WindowsX64Tests(unittest.TestCase):
 
     def test_check_inputstream_mpd(self):
         inputstreamhelper.system_os = lambda: 'Windows'
+        platform.machine = lambda: 'x86_64'
         is_helper = inputstreamhelper.Helper('mpd', drm='com.widevine.alpha')
-        is_helper._arch = lambda: 'x86_64'
         is_helper.remove_widevine()
         is_installed = is_helper.check_inputstream()
         self.assertTrue(is_installed, True)
 
-    def test_check_inputstream_mpd_again(self):
+    def test_check_inputstream_hls_again(self):
         inputstreamhelper.system_os = lambda: 'Windows'
-        is_helper = inputstreamhelper.Helper('mpd', drm='com.widevine.alpha')
-        is_helper._arch = lambda: 'x86_64'
+        platform.machine = lambda: 'AMD64'
+        platform.architecture = lambda: ['64bit', '']
+        is_helper = inputstreamhelper.Helper('hls', drm='com.widevine.alpha')
         is_installed = is_helper.check_inputstream()
         self.assertTrue(is_installed, True)
 
     def test_check_inputstream_rtmp(self):
         inputstreamhelper.system_os = lambda: 'Windows'
-        is_helper = inputstreamhelper.Helper('rtmp', drm='com.widevine.alpha')
-        is_helper._arch = lambda: 'x86_64'
+        platform.machine = lambda: 'x86_64'
+        is_helper = inputstreamhelper.Helper('rtmp')
+        is_installed = is_helper.check_inputstream()
+        self.assertTrue(is_installed, True)
+
+    def test_check_inputstream_disabled(self):
+        inputstreamhelper.system_os = lambda: 'Windows'
+        platform.machine = lambda: 'x86_64'
+        is_helper = inputstreamhelper.Helper('mpd', drm='com.widevine.alpha')
+        is_helper.disable()
         is_installed = is_helper.check_inputstream()
+        is_helper.enable()
         self.assertTrue(is_installed, True)