PyPI - edq-utils - Versions diffs - 0.1.1__tar.gz → 0.1.2__tar.gz - Mend

@@ -35,6 +35,7 @@ import edq.util.json
 import edq.util.pyimport
 TEST_CASE_SEP: str = '---'
+OUTPUT_SEP: str = '+++'
 DATA_DIR_ID: str = '__DATA_DIR__'
 ABS_DATA_DIR_ID: str = '__ABS_DATA_DIR__'
 TEMP_DIR_ID: str = '__TEMP_DIR__'
@@ -149,7 +150,7 @@ class CLITestInfo:
         """
         Split stdout and stderr into different strings for testing.
         By default, these two will be combined.
-        If both are non-empty, then they will be joined like: f"{stdout}\n{TEST_CASE_SEP}\n{stderr}".
+        If both are non-empty, then they will be joined like: f"{stdout}\n{OUTPUT_SEP}\n{stderr}".
         Otherwise, only the non-empty one will be present with no separator.
         Any stdout assertions will be applied to the combined text.
         """
@@ -293,7 +294,7 @@ def _get_test_method(test_name: str, path: str, data_dir: str) -> typing.Callabl
         if (not test_info.split_stdout_stderr):
             if ((len(stdout_text) > 0) and (len(stderr_text) > 0)):
-                stdout_text = f"{stdout_text}\n{TEST_CASE_SEP}\n{stderr_text}"
+                stdout_text = f"{stdout_text}\n{OUTPUT_SEP}\n{stderr_text}"
             elif (len(stderr_text) > 0):
                 stdout_text = stderr_text

@@ -104,10 +104,6 @@ recursive=no
 # source root.
 source-roots=
-# When enabled, pylint would attempt to guess common misconfiguration and emit
-# user-friendly hints instead of false-positive error messages.
-suggestion-mode=yes
 # Allow loading of arbitrary C extensions. Extensions are imported into the
 # active Python interpreter and may run arbitrary code.
 unsafe-load-any-extension=no

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edq-utils
-Version: 0.1.1
+Version: 0.1.2
 Summary: Common utilities used by EduLinq Python projects.
 Author-email: Eriq Augustine <eriq@edulinq.org>
 License: MIT License

@@ -2,4 +2,4 @@
 General Python tools used by several EduLinq projects.
 """
-__version__ = '0.1.1'
+__version__ = '0.1.2'

@@ -0,0 +1,9 @@
+{
+    "cli": "edq.cli.version",
+    "arguments": [
+        '--help'
+    ],
+    "error": true
+}
+---
+builtins.SystemExit: 0

@@ -14,6 +14,20 @@ class BaseTest(unittest.TestCase):
     maxDiff = None
     """ Don't limit the size of diffs. """
+    def assertJSONEqual(self, a: typing.Any, b: typing.Any, message: typing.Union[str, None] = None) -> None:  # pylint: disable=invalid-name
+        """
+        Like unittest.TestCase.assertEqual(),
+        but uses a default assertion message containing the full JSON representation of the arguments.
+        """
+        a_json = edq.util.json.dumps(a, indent = 4)
+        b_json = edq.util.json.dumps(b, indent = 4)
+        if (message is None):
+            message = FORMAT_STR % (a_json, b_json)
+        super().assertEqual(a, b, msg = message)
     def assertJSONDictEqual(self, a: typing.Any, b: typing.Any, message: typing.Union[str, None] = None) -> None:  # pylint: disable=invalid-name
         """
         Like unittest.TestCase.assertDictEqual(),

edq-utils 0.1.1tar.gz → 0.1.2tar.gz

@@ -40,6 +40,7 @@ edq/testing/testdata/cli/data/configs/empty/edq-config.json
 edq/testing/testdata/cli/data/configs/simple-1/edq-config.json
 edq/testing/testdata/cli/data/configs/simple-2/edq-config.json
 edq/testing/testdata/cli/data/configs/value-number/edq-config.json
+edq/testing/testdata/cli/tests/help_base.txt
 edq/testing/testdata/cli/tests/platform_skip.txt
 edq/testing/testdata/cli/tests/version_base.txt
 edq/testing/testdata/cli/tests/config/list/config_list_base.txt