change tests to allow quiet run

jblance · Oct 10, 2023 · c3708f7 · c3708f7
1 parent 6fc9886
commit c3708f7
Show file tree

Hide file tree

Showing 42 changed files with 14 additions and 14 deletions.
diff --git a/makefile b/makefile
@@ -1,14 +1,14 @@
-format: 
-	flake8 setup.py mppsolar tests
-
 mppsolar-tests: 
-	python3 -m unittest discover -s tests/mppsolar -f -v
+	python3 -m unittest discover -s tests/mppsolar_tests -f -v
 
 powermon-unit-tests: 
-	python3 -m unittest discover -s tests/powermon/unit -f -v
+	python3 -m unittest discover -s tests/powermon_tests/unit -f -v
 
 powermon-integration-tests: 
-	python3 -m unittest discover -s tests/powermon/integration -f -v
+	python3 -m unittest discover -s tests/powermon_tests/integration -f -v
+
+test:
+	python3 -m unittest discover -s tests -f 
 
 tests: powermon-unit-tests powermon-integration-tests mppsolar-tests
 

diff --git a/tests/mppsolar/__init__.py → tests/mppsolar_tests/__init__.py b/tests/mppsolar/__init__.py → tests/mppsolar_tests/__init__.py
diff --git a/tests/mppsolar/test_cmd_mppsolar.py → tests/mppsolar_tests/test_cmd_mppsolar.py b/tests/mppsolar/test_cmd_mppsolar.py → tests/mppsolar_tests/test_cmd_mppsolar.py
diff --git a/tests/mppsolar/test_cmd_mppsolar_pi30revo.py → ...solar_tests/test_cmd_mppsolar_pi30revo.py b/tests/mppsolar/test_cmd_mppsolar_pi30revo.py → ...solar_tests/test_cmd_mppsolar_pi30revo.py
@@ -31,7 +31,7 @@
 
 def do_test(self, command, expected, respno=0):
     try:
-        print(command, end=" ")
+        # print(command, end=" ")
         result = subprocess.run(
             [
                 "mppsolar",
@@ -53,7 +53,7 @@ def do_test(self, command, expected, respno=0):
         # print(result.stderr)
         self.assertEqual(f"CMD: {command}\n{result.stdout}", f"CMD: {command}\n{expected}")
         self.assertEqual(result.returncode, 0)
-        print("OK")
+        # print("OK")
     except subprocess.CalledProcessError as error:
         print(error.stdout)
         print(error.stderr)

diff --git a/tests/mppsolar/test_init.py → tests/mppsolar_tests/test_init.py b/tests/mppsolar/test_init.py → tests/mppsolar_tests/test_init.py
diff --git a/tests/mppsolar/test_output_mqtt.py → tests/mppsolar_tests/test_output_mqtt.py b/tests/mppsolar/test_output_mqtt.py → tests/mppsolar_tests/test_output_mqtt.py
diff --git a/tests/mppsolar/test_protocol_daly.py → tests/mppsolar_tests/test_protocol_daly.py b/tests/mppsolar/test_protocol_daly.py → tests/mppsolar_tests/test_protocol_daly.py
diff --git a/tests/mppsolar/test_protocol_daly40.py → tests/mppsolar_tests/test_protocol_daly40.py b/tests/mppsolar/test_protocol_daly40.py → tests/mppsolar_tests/test_protocol_daly40.py
diff --git a/tests/mppsolar/test_protocol_helpers.py → ...s/mppsolar_tests/test_protocol_helpers.py b/tests/mppsolar/test_protocol_helpers.py → ...s/mppsolar_tests/test_protocol_helpers.py
diff --git a/tests/mppsolar/test_protocol_jk02.py → tests/mppsolar_tests/test_protocol_jk02.py b/tests/mppsolar/test_protocol_jk02.py → tests/mppsolar_tests/test_protocol_jk02.py
diff --git a/tests/mppsolar/test_protocol_jk04.py → tests/mppsolar_tests/test_protocol_jk04.py b/tests/mppsolar/test_protocol_jk04.py → tests/mppsolar_tests/test_protocol_jk04.py
diff --git a/tests/mppsolar/test_protocol_jk232.py → tests/mppsolar_tests/test_protocol_jk232.py b/tests/mppsolar/test_protocol_jk232.py → tests/mppsolar_tests/test_protocol_jk232.py
diff --git a/tests/mppsolar/test_protocol_jk485.py → tests/mppsolar_tests/test_protocol_jk485.py b/tests/mppsolar/test_protocol_jk485.py → tests/mppsolar_tests/test_protocol_jk485.py
diff --git a/tests/mppsolar/test_protocol_pi16.py → tests/mppsolar_tests/test_protocol_pi16.py b/tests/mppsolar/test_protocol_pi16.py → tests/mppsolar_tests/test_protocol_pi16.py
diff --git a/tests/mppsolar/test_protocol_pi17.py → tests/mppsolar_tests/test_protocol_pi17.py b/tests/mppsolar/test_protocol_pi17.py → tests/mppsolar_tests/test_protocol_pi17.py
@@ -133,7 +133,7 @@
 
 def do_test(self, command, expected, respno=0):
     try:
-        print(command, end=" ")
+        # print(command, end=" ")
         result = subprocess.run(
             [
                 "mppsolar",
@@ -156,7 +156,7 @@ def do_test(self, command, expected, respno=0):
         # print(".")
         self.assertEqual(f"CMD: {command}\n{result.stdout}", f"CMD: {command}\n{expected}")
         self.assertEqual(result.returncode, 0)
-        print("OK")
+        # print("OK")
     except subprocess.CalledProcessError as error:
         print(error.stdout)
         print(error.stderr)

diff --git a/tests/mppsolar/test_protocol_pi17m058.py → .../mppsolar_tests/test_protocol_pi17m058.py b/tests/mppsolar/test_protocol_pi17m058.py → .../mppsolar_tests/test_protocol_pi17m058.py
@@ -33,7 +33,7 @@
 
 def do_test(self, command, expected, respno=0):
     try:
-        print(command, end=" ")
+        # print(command, end=" ")
         result = subprocess.run(
             [
                 "mppsolar",
@@ -56,7 +56,7 @@ def do_test(self, command, expected, respno=0):
         # print(".")
         self.assertEqual(f"CMD: {command}\n{result.stdout}", f"CMD: {command}\n{expected}")
         self.assertEqual(result.returncode, 0)
-        print("OK")
+        # print("OK")
     except subprocess.CalledProcessError as error:
         print(error.stdout)
         print(error.stderr)

diff --git a/tests/mppsolar/test_protocol_pi18.py → tests/mppsolar_tests/test_protocol_pi18.py b/tests/mppsolar/test_protocol_pi18.py → tests/mppsolar_tests/test_protocol_pi18.py
diff --git a/tests/mppsolar/test_protocol_pi18lvx.py → ...s/mppsolar_tests/test_protocol_pi18lvx.py b/tests/mppsolar/test_protocol_pi18lvx.py → ...s/mppsolar_tests/test_protocol_pi18lvx.py
diff --git a/tests/mppsolar/test_protocol_pi18sv.py → tests/mppsolar_tests/test_protocol_pi18sv.py b/tests/mppsolar/test_protocol_pi18sv.py → tests/mppsolar_tests/test_protocol_pi18sv.py
diff --git a/tests/mppsolar/test_protocol_pi30.py → tests/mppsolar_tests/test_protocol_pi30.py b/tests/mppsolar/test_protocol_pi30.py → tests/mppsolar_tests/test_protocol_pi30.py
diff --git a/tests/mppsolar/test_protocol_pi30max.py → ...s/mppsolar_tests/test_protocol_pi30max.py b/tests/mppsolar/test_protocol_pi30max.py → ...s/mppsolar_tests/test_protocol_pi30max.py
diff --git a/tests/mppsolar/test_protocol_pi30mst.py → ...s/mppsolar_tests/test_protocol_pi30mst.py b/tests/mppsolar/test_protocol_pi30mst.py → ...s/mppsolar_tests/test_protocol_pi30mst.py
diff --git a/tests/mppsolar/test_protocol_ved.py → tests/mppsolar_tests/test_protocol_ved.py b/tests/mppsolar/test_protocol_ved.py → tests/mppsolar_tests/test_protocol_ved.py
diff --git a/tests/powermon/__init__.py → tests/powermon_tests/__init__.py b/tests/powermon/__init__.py → tests/powermon_tests/__init__.py
diff --git a/tests/powermon/integration/__init__.py → tests/powermon_tests/integration/__init__.py b/tests/powermon/integration/__init__.py → tests/powermon_tests/integration/__init__.py
diff --git a/...mon/integration/test_cmd_powermon_pi30.py → ...sts/integration/test_cmd_powermon_pi30.py b/...mon/integration/test_cmd_powermon_pi30.py → ...sts/integration/test_cmd_powermon_pi30.py
diff --git a/.../integration/test_cmd_powermon_pi30max.py → .../integration/test_cmd_powermon_pi30max.py b/.../integration/test_cmd_powermon_pi30max.py → .../integration/test_cmd_powermon_pi30max.py
diff --git a/...mon/integration/test_config_validation.py → ...sts/integration/test_config_validation.py b/...mon/integration/test_config_validation.py → ...sts/integration/test_config_validation.py
@@ -17,14 +17,14 @@
 
 def do_test(self, filename):
     try:
-        print(f"testing {filename}", end=' ')
+        # print(f"testing {filename}", end=' ')
         expected = "Config validation successful\n"
         result = subprocess.run(
             ["powermon", "-V", "-C", filename,], check=True, capture_output=True, text=True
         )
         self.assertEqual(result.stdout, expected)
         self.assertEqual(result.returncode, 0)
-        print('OK')
+        # print('OK')
     except subprocess.CalledProcessError as error:
         print(error.stdout)
         print(error.stderr)

diff --git a/...rmon/integration/test_powermon_formats.py → ...ests/integration/test_powermon_formats.py b/...rmon/integration/test_powermon_formats.py → ...ests/integration/test_powermon_formats.py
diff --git a/tests/powermon/unit/__init__.py → tests/powermon_tests/unit/__init__.py b/tests/powermon/unit/__init__.py → tests/powermon_tests/unit/__init__.py
diff --git a/tests/powermon/unit/test_command.py → tests/powermon_tests/unit/test_command.py b/tests/powermon/unit/test_command.py → tests/powermon_tests/unit/test_command.py
diff --git a/.../powermon/unit/test_command_definition.py → ...mon_tests/unit/test_command_definition.py b/.../powermon/unit/test_command_definition.py → ...mon_tests/unit/test_command_definition.py
diff --git a/tests/powermon/unit/test_device.py → tests/powermon_tests/unit/test_device.py b/tests/powermon/unit/test_device.py → tests/powermon_tests/unit/test_device.py
diff --git a/tests/powermon/unit/test_format_hass.py → ...s/powermon_tests/unit/test_format_hass.py b/tests/powermon/unit/test_format_hass.py → ...s/powermon_tests/unit/test_format_hass.py
diff --git a/tests/powermon/unit/test_format_htmltable.py → ...ermon_tests/unit/test_format_htmltable.py b/tests/powermon/unit/test_format_htmltable.py → ...ermon_tests/unit/test_format_htmltable.py
diff --git a/tests/powermon/unit/test_format_simple.py → ...powermon_tests/unit/test_format_simple.py b/tests/powermon/unit/test_format_simple.py → ...powermon_tests/unit/test_format_simple.py
diff --git a/tests/powermon/unit/test_format_table.py → .../powermon_tests/unit/test_format_table.py b/tests/powermon/unit/test_format_table.py → .../powermon_tests/unit/test_format_table.py
diff --git a/...mon/unit/test_powermon_output_api_mqtt.py → ...sts/unit/test_powermon_output_api_mqtt.py b/...mon/unit/test_powermon_output_api_mqtt.py → ...sts/unit/test_powermon_output_api_mqtt.py
diff --git a/...owermon/unit/test_powermon_output_mqtt.py → ...n_tests/unit/test_powermon_output_mqtt.py b/...owermon/unit/test_powermon_output_mqtt.py → ...n_tests/unit/test_powermon_output_mqtt.py
diff --git a/tests/powermon/unit/test_protocol_pi30.py → ...powermon_tests/unit/test_protocol_pi30.py b/tests/powermon/unit/test_protocol_pi30.py → ...powermon_tests/unit/test_protocol_pi30.py
diff --git a/tests/powermon/unit/test_serial_port.py → ...s/powermon_tests/unit/test_serial_port.py b/tests/powermon/unit/test_serial_port.py → ...s/powermon_tests/unit/test_serial_port.py
diff --git a/tests/powermon/unit/test_triggers.py → tests/powermon_tests/unit/test_triggers.py b/tests/powermon/unit/test_triggers.py → tests/powermon_tests/unit/test_triggers.py