mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 00:39:46 +00:00
python3-jsonpointer: upgrade to 2.4
Drop the merged patch. (From OE-Core rev: d4581006a2a05c289280bece02b9a44e409299b8) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
28de7ad731
commit
5591c1eebf
@@ -1,62 +0,0 @@
|
|||||||
From 04a864f33848da6af1dea906ba4922770022ef66 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ross Burton <ross.burton@arm.com>
|
|
||||||
Date: Thu, 16 Mar 2023 14:21:32 +0000
|
|
||||||
Subject: [PATCH] Clean up test runner
|
|
||||||
|
|
||||||
Test code doesn't need to manually construct a TestSuite and a
|
|
||||||
TextTestRunner, the unittest module has a discovery function that does
|
|
||||||
all this for you.
|
|
||||||
|
|
||||||
Delete all of the manual logic from tests.py, replace it with the two
|
|
||||||
lines to bring in the doctest unit tests, and update the makefile to
|
|
||||||
run the unittest discovery.
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://github.com/stefankoegl/python-json-pointer/pull/54]
|
|
||||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
|
||||||
---
|
|
||||||
makefile | 2 +-
|
|
||||||
tests.py | 24 ++++--------------------
|
|
||||||
2 files changed, 5 insertions(+), 21 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/tests.py b/tests.py
|
|
||||||
index 9252369..6b4b8cc 100755
|
|
||||||
--- a/tests.py
|
|
||||||
+++ b/tests.py
|
|
||||||
@@ -7,6 +7,7 @@ import doctest
|
|
||||||
import unittest
|
|
||||||
import sys
|
|
||||||
import copy
|
|
||||||
+import jsonpointer
|
|
||||||
from jsonpointer import resolve_pointer, EndOfList, JsonPointerException, \
|
|
||||||
JsonPointer, set_pointer
|
|
||||||
|
|
||||||
@@ -410,23 +411,6 @@ class AltTypesTests(unittest.TestCase):
|
|
||||||
self.assertRaises(JsonPointerException, resolve_pointer, doc, '/root/1/2/3/4')
|
|
||||||
|
|
||||||
|
|
||||||
-
|
|
||||||
-suite = unittest.TestSuite()
|
|
||||||
-suite.addTest(unittest.makeSuite(SpecificationTests))
|
|
||||||
-suite.addTest(unittest.makeSuite(ComparisonTests))
|
|
||||||
-suite.addTest(unittest.makeSuite(WrongInputTests))
|
|
||||||
-suite.addTest(unittest.makeSuite(ToLastTests))
|
|
||||||
-suite.addTest(unittest.makeSuite(SetTests))
|
|
||||||
-suite.addTest(unittest.makeSuite(AltTypesTests))
|
|
||||||
-
|
|
||||||
-modules = ['jsonpointer']
|
|
||||||
-
|
|
||||||
-for module in modules:
|
|
||||||
- m = __import__(module, fromlist=[module])
|
|
||||||
- suite.addTest(doctest.DocTestSuite(m))
|
|
||||||
-
|
|
||||||
-runner = unittest.TextTestRunner(verbosity=1)
|
|
||||||
-result = runner.run(suite)
|
|
||||||
-
|
|
||||||
-if not result.wasSuccessful():
|
|
||||||
- sys.exit(1)
|
|
||||||
+def load_tests(loader, tests, ignore):
|
|
||||||
+ tests.addTests(doctest.DocTestSuite(jsonpointer))
|
|
||||||
+ return tests
|
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
+1
-3
@@ -5,9 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=32b15c843b7a329130f4e266a281ebb3"
|
|||||||
|
|
||||||
inherit pypi ptest setuptools3
|
inherit pypi ptest setuptools3
|
||||||
|
|
||||||
SRC_URI += "file://0001-Clean-up-test-runner.patch"
|
SRC_URI[sha256sum] = "585cee82b70211fa9e6043b7bb89db6e1aa49524340dde8ad6b63206ea689d88"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "97cba51526c829282218feb99dab1b1e6bdf8efd1c43dc9d57be093c0d69c99a"
|
|
||||||
|
|
||||||
RDEPENDS:${PN} += " \
|
RDEPENDS:${PN} += " \
|
||||||
${PYTHON_PN}-json \
|
${PYTHON_PN}-json \
|
||||||
Reference in New Issue
Block a user