test - py3 and PEP8 to remove noise from Flake8

BlackHole · Oct 5, 2023 · ae558b2 · ae558b2
1 parent 1a9e634
commit ae558b2
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 68 deletions.
diff --git a/tests/enigma.py b/tests/enigma.py
@@ -1,4 +1,6 @@
-from __future__ import print_function
+import time
+from . import events
+
 # fake-enigma
 
 
@@ -16,11 +18,7 @@ def __call__(self):
 
 timers = set()
 
-import time
-
-from events import eventfnc
-
-##################### ENIGMA BASE
+#  ENIGMA BASE
 
 
 class eTimer:
@@ -86,7 +84,7 @@ def run(duration=1000):
 		runIteration()
 
 
-##################### ENIGMA GUI
+# ENIGMA GUI
 
 eSize = None
 ePoint = None
@@ -129,15 +127,15 @@ def __init__(self):
 		self.m_event = slot()
 		self.m_record_event = slot()
 
-	@eventfnc
+	@events.eventfnc
 	def recordService(self, service):
 		return iRecordableService(service)
 
-	@eventfnc
+	@events.eventfnc
 	def stopRecordService(self, service):
 		service.stop()
 
-	@eventfnc
+	@events.eventfnc
 	def playService(self, service):
 		return None
 
@@ -176,15 +174,15 @@ class iRecordableService:
 	def __init__(self, ref):
 		self.ref = ref
 
-	@eventfnc
+	@events.eventfnc
 	def prepare(self, filename, begin, end, event_id):
 		return 0
 
-	@eventfnc
+	@events.eventfnc
 	def start(self):
 		return 0
 
-	@eventfnc
+	@events.eventfnc
 	def stop(self):
 		return 0
 
@@ -305,10 +303,10 @@ def info(self, ref):
 
 eServiceCenter()
 
-##################### ENIGMA CHROOT
+# ENIGMA CHROOT
 
 print("import directories")
-import Tools.Directories
+import Tools.Directories  # noqa: E402
 print("done")
 
 chroot = "."
@@ -319,44 +317,41 @@ def info(self, ref):
 Tools.Directories.defaultPaths[Tools.Directories.SCOPE_SKIN] = ("../data/", Tools.Directories.PATH_DONTCREATE)
 Tools.Directories.defaultPaths[Tools.Directories.SCOPE_CONFIG] = ("/etc/enigma2/", Tools.Directories.PATH_DONTCREATE)
 
-##################### ENIGMA CONFIG
+# ENIGMA CONFIG
 
 print("import config")
-import Components.config
+import Components.config  # noqa: E402
 print("done")
 
-my_config = [
-"config.skin.primary_skin=None\n"
-]
-
+my_config = ["config.skin.primary_skin=None\n"]
 Components.config.config.unpickle(my_config)
 
-##################### ENIGMA ACTIONS
+# ENIGMA ACTIONS
 
 
 class eActionMap:
 	def __init__(self):
 		pass
 
 
-##################### ENIGMA STARTUP:
+# ENIGMA STARTUP:
 
 def init_nav():
 	print("init nav")
-	import Navigation
-	import NavigationInstance
+	import Navigation  # noqa: E402
+	import NavigationInstance  # noqa: E402
 	NavigationInstance.instance = Navigation.Navigation()
 
 
 def init_record_config():
 	print("init recording")
-	import Components.RecordingConfig
+	import Components.RecordingConfig  # noqa: E402
 	Components.RecordingConfig.InitRecordingConfig()
 
 
 def init_parental_control():
 	print("init parental")
-	from Components.ParentalControl import InitParentalControl
+	from Components.ParentalControl import InitParentalControl  # noqa: E402
 	InitParentalControl()
 
 
@@ -367,26 +362,26 @@ def init_all():
 	init_record_config()
 	init_parental_control()
 
-	import Components.InputDevice
+	import Components.InputDevice  # noqa: E402
 	Components.InputDevice.InitInputDevices()
 
-	import Components.AVSwitch
+	import Components.AVSwitch  # noqa: E402
 	Components.AVSwitch.InitAVSwitch()
 
-	import Components.UsageConfig
+	import Components.UsageConfig  # noqa: E402
 	Components.UsageConfig.InitUsageConfig()
 
-	import Components.Network
+	import Components.Network  # noqa: E402
 	Components.Network.InitNetwork()
 
-	import Components.Lcd
+	import Components.Lcd  # noqa: E402
 	Components.Lcd.InitLcd()
 
-	import Components.SetupDevices
+	import Components.SetupDevices  # noqa: E402
 	Components.SetupDevices.InitSetupDevices()
 
-	import Components.RFmod
+	import Components.RFmod  # noqa: E402
 	Components.RFmod.InitRFmod()
 
-	import Screens.Ci
+	import Screens.Ci  # noqa: E402
 	Screens.Ci.InitCiConfig()
diff --git a/tests/events.py b/tests/events.py
@@ -1,6 +1,5 @@
-from __future__ import print_function
 import time
-import tests
+from . import tests
 
 recorded_events = []
 

diff --git a/tests/fake_time.py b/tests/fake_time.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 import time
 
 real_time = None
@@ -12,7 +11,7 @@ def setRealtime():
 
 def setIdealtime():
 	global real_time
-	real_time = lambda: 0
+	real_time = lambda: 0  # noqa: E731
 
 
 def setTime(now):

diff --git a/tests/test_timer.py b/tests/test_timer.py
@@ -1,11 +1,12 @@
-from __future__ import print_function
 import time
-
-import enigma
-import tests
+import calendar
+from os import environ
+from . import enigma
+from . import tests
+from . import events
 
 
-#enigma.reset()
+# enigma.reset()
 def test_timer(repeat=0, timer_start=3600, timer_length=1000, sim_length=86400 * 7):
 
 	import NavigationInstance
@@ -25,20 +26,19 @@ def test_timer(repeat=0, timer_start=3600, timer_length=1000, sim_length=86400 *
 	import RecordTimer
 
 	timer = RecordTimer.createTimer(xml.etree.cElementTree.fromstring(
-	"""
-		<timer
-			begin="%d"
-			end="%d"
-			serviceref="1:0:1:6DD2:44D:1:C00000:0:0:0:"
-			repeated="%d"
-			name="Test Event Name"
-			description="Test Event Description"
-			afterevent="nothing"
-			eit="56422"
-			disabled="0"
-			justplay="0">
-	</timer>""" % (at + timer_start, at + timer_start + timer_length, repeat)
-	))
+		"""
+			<timer
+				begin="%d"
+				end="%d"
+				serviceref="1:0:1:6DD2:44D:1:C00000:0:0:0:"
+				repeated="%d"
+				name="Test Event Name"
+				description="Test Event Description"
+				afterevent="nothing"
+				eit="56422"
+				disabled="0"
+				justplay="0">
+			</timer>""" % (at + timer_start, at + timer_start + timer_length, repeat)))
 
 	t.record(timer)
 
@@ -74,17 +74,10 @@ def test_timer(repeat=0, timer_start=3600, timer_length=1000, sim_length=86400 *
 enigma.init_record_config()
 enigma.init_parental_control()
 
-
-from events import log
-
-import calendar
-
-
-from os import environ
 # we are operating in CET/CEST
 environ['TZ'] = 'CET'
 time.tzset()
 
-#log(test_timer, test_name = "test_timer_repeating", base_time = calendar.timegm((2007, 3, 1, 12, 0, 0)), repeat=0x7f, sim_length = 86400 * 7)
-log(test_timer, test_name="test_timer_repeating_dst_skip", base_time=calendar.timegm((2007, 0o3, 20, 0, 0, 0)), timer_start=3600, repeat=0x7f, sim_length=86400 * 7)
-#log(test_timer, test_name = "test_timer_repeating_dst_start", base_time = calendar.timegm((2007, 03, 20, 0, 0, 0)), timer_start = 10000, repeat=0x7f, sim_length = 86400 * 7)
+# events.log(test_timer, test_name = "test_timer_repeating", base_time = calendar.timegm((2007, 3, 1, 12, 0, 0)), repeat=0x7f, sim_length = 86400 * 7)
+events.log(test_timer, test_name="test_timer_repeating_dst_skip", base_time=calendar.timegm((2007, 0o3, 20, 0, 0, 0)), timer_start=3600, repeat=0x7f, sim_length=86400 * 7)
+# events.log(test_timer, test_name = "test_timer_repeating_dst_start", base_time = calendar.timegm((2007, 03, 20, 0, 0, 0)), timer_start = 10000, repeat=0x7f, sim_length = 86400 * 7)