Prevent tests from running twice

ThomasFarstrike · ThomasFarstrike · commit 28d41e3a922a · 2025-11-16T01:57:04.000+01:00
diff --git a/tests/test_graphical_about_app.py b/tests/test_graphical_about_app.py
@@ -171,7 +171,3 @@ def test_about_app_shows_os_version(self):
         print("=== OS version test completed successfully ===")
 
 
-if __name__ == "__main__":
-    # Note: This file is executed by unittest.sh which handles unittest.main()
-    # But we include it here for completeness
-    unittest.main()
diff --git a/tests/test_graphical_animation_deleted_widget.py b/tests/test_graphical_animation_deleted_widget.py
@@ -214,5 +214,3 @@ def test_multiple_animations_deleted(self):
         print("=== Multiple animations test PASSED ===")
 
 
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tests/test_graphical_custom_keyboard.py b/tests/test_graphical_custom_keyboard.py
@@ -316,5 +316,3 @@ def test_keyboard_with_standard_comparison(self):
         print("=== Comparison test PASSED ===")
 
 
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tests/test_graphical_custom_keyboard_basic.py b/tests/test_graphical_custom_keyboard_basic.py
@@ -188,5 +188,3 @@ def test_api_compatibility(self):
         print("API compatibility verified")
 
 
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tests/test_graphical_keyboard_animation.py b/tests/test_graphical_keyboard_animation.py
@@ -185,5 +185,3 @@ def test_keyboard_has_get_y_and_set_y(self):
         print("=== Position methods test PASSED ===")
 
 
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tests/test_graphical_keyboard_method_forwarding.py b/tests/test_graphical_keyboard_method_forwarding.py
@@ -141,5 +141,3 @@ def test_method_forwarding_preserves_behavior(self):
         print("Method forwarding preserves behavior correctly!")
 
 
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tests/test_graphical_keyboard_styling.py b/tests/test_graphical_keyboard_styling.py
@@ -373,7 +373,3 @@ def test_keyboard_buttons_not_pure_white_in_light_mode(self):
         print("=== Pure white test PASSED ===")
 
 
-if __name__ == "__main__":
-    # Note: This file is executed by unittest.sh which handles unittest.main()
-    # But we include it here for completeness
-    unittest.main()
diff --git a/tests/test_graphical_start_app.py b/tests/test_graphical_start_app.py
@@ -67,5 +67,3 @@ def test_restart_launcher(self):
         print("Launcher restart successful")
 
 
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tests/test_intent.py b/tests/test_intent.py
@@ -302,5 +302,3 @@ def test_complex_extras_data(self):
         self.assertTrue(intent.extras["data"]["config"]["retry"])
 
 
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_osupdate.py b/tests/test_osupdate.py
@@ -564,5 +564,3 @@ def test_download_exact_chunk_multiple(self):
         self.assertEqual(result['bytes_written'], 8192)
 
 
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_osupdate_graphical.py b/tests/test_osupdate_graphical.py
@@ -325,5 +325,3 @@ def test_capture_with_labels_visible(self):
         capture_screenshot(screenshot_path)
 
 
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_shared_preferences.py b/tests/test_shared_preferences.py
@@ -476,5 +476,3 @@ def test_large_nested_structure(self):
         self.assertEqual(loaded["settings"]["limits"][2], 30)
 
 
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/unittest.sh b/tests/unittest.sh
@@ -5,6 +5,7 @@ mydir=$(dirname "$mydir")
 testdir="$mydir"
 scriptdir=$(readlink -f "$mydir"/../scripts/)
 fs="$mydir"/../internal_filesystem/
+mpremote="$mydir"/../lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py
 
 # Parse arguments
 ondevice=""
@@ -22,6 +23,11 @@ while [ $# -gt 0 ]; do
     shift
 done
 
+if [ ! -z "$ondevice" ]; then
+	echo "Hack: reset the device to make sure no previous UnitTest classes have been registered..."
+	"$mpremote" reset
+	sleep 15
+fi
 
 # print os and set binary
 os_name=$(uname -s)
@@ -80,7 +86,7 @@ result = unittest.main() ; sys.exit(0 if result.wasSuccessful() else 1) "
 		echo "$test logging to $testlog"
 		if [ $is_graphical -eq 1 ]; then
 			# Graphical test: system already initialized, just add test paths
-			mpremote.py exec "import sys ; sys.path.append('lib') ; sys.path.append('tests')
+			"$mpremote" exec "import sys ; sys.path.append('lib') ; sys.path.append('tests')
 $(cat $file)
 result = unittest.main()
 if result.wasSuccessful():
@@ -90,7 +96,7 @@ else:
 " | tee "$testlog"
 		else
 			# Regular test: no boot files
-			mpremote.py exec "import sys ; sys.path.append('lib')
+			"$mpremote" exec "import sys ; sys.path.append('lib')
 $(cat $file)
 result = unittest.main()
 if result.wasSuccessful():
@@ -99,7 +105,7 @@ else:
     print('TEST WAS A FAILURE')
 " | tee "$testlog"
 		fi
-		grep "TEST WAS A SUCCESS" "$testlog"
+		grep -q "TEST WAS A SUCCESS" "$testlog"
 		result=$?
 	fi
 	popd

Original file line number	Diff line number	Diff line change
`@@ -214,5 +214,3 @@ def test_multiple_animations_deleted(self):`
`214`	`214`	`print("=== Multiple animations test PASSED ===")`
`215`	`215`
`216`	`216`
`217`		`-if __name__ == "__main__":`
`218`		`- unittest.main()`
Original file line number	Diff line number	Diff line change
`@@ -316,5 +316,3 @@ def test_keyboard_with_standard_comparison(self):`
`316`	`316`	`print("=== Comparison test PASSED ===")`
`317`	`317`
`318`	`318`
`319`		`-if __name__ == "__main__":`
`320`		`- unittest.main()`
Original file line number	Diff line number	Diff line change
`@@ -188,5 +188,3 @@ def test_api_compatibility(self):`
`188`	`188`	`print("API compatibility verified")`
`189`	`189`
`190`	`190`
`191`		`-if __name__ == "__main__":`
`192`		`- unittest.main()`
Original file line number	Diff line number	Diff line change
`@@ -185,5 +185,3 @@ def test_keyboard_has_get_y_and_set_y(self):`
`185`	`185`	`print("=== Position methods test PASSED ===")`
`186`	`186`
`187`	`187`
`188`		`-if __name__ == "__main__":`
`189`		`- unittest.main()`
Original file line number	Diff line number	Diff line change
`@@ -141,5 +141,3 @@ def test_method_forwarding_preserves_behavior(self):`
`141`	`141`	`print("Method forwarding preserves behavior correctly!")`
`142`	`142`
`143`	`143`
`144`		`-if __name__ == "__main__":`
`145`		`- unittest.main()`
Original file line number	Diff line number	Diff line change
`@@ -67,5 +67,3 @@ def test_restart_launcher(self):`
`67`	`67`	`print("Launcher restart successful")`
`68`	`68`
`69`	`69`
`70`		`-if __name__ == "__main__":`
`71`		`- unittest.main()`
Original file line number	Diff line number	Diff line change
`@@ -302,5 +302,3 @@ def test_complex_extras_data(self):`
`302`	`302`	`self.assertTrue(intent.extras["data"]["config"]["retry"])`
`303`	`303`
`304`	`304`
`305`		`-if __name__ == '__main__':`
`306`		`- unittest.main()`
Original file line number	Diff line number	Diff line change
`@@ -564,5 +564,3 @@ def test_download_exact_chunk_multiple(self):`
`564`	`564`	`self.assertEqual(result['bytes_written'], 8192)`
`565`	`565`
`566`	`566`
`567`		`-if __name__ == '__main__':`
`568`		`- unittest.main()`