diff --git a/support/testing/tests/package/sample_python_subprocess32.py b/support/testing/tests/package/sample_python_subprocess32.py deleted file mode 100644 index 8579745cc8..0000000000 --- a/support/testing/tests/package/sample_python_subprocess32.py +++ /dev/null @@ -1,6 +0,0 @@ -import subprocess32 - -output = subprocess32.check_output(["ls", "-l", "/dev/null"]) -print(output) -assert("/dev/null" in output) -assert("No such" not in output) diff --git a/support/testing/tests/package/test_bmap_tools.py b/support/testing/tests/package/test_bmap_tools.py index baa23154f8..a179027633 100644 --- a/support/testing/tests/package/test_bmap_tools.py +++ b/support/testing/tests/package/test_bmap_tools.py @@ -45,14 +45,6 @@ class TestBmapTools(BRTest): self.assertRunOk(cmd, timeout=20) -class TestPy2BmapTools(TestBmapTools): - __test__ = True - config = TestBmapTools.config + \ - """ - BR2_PACKAGE_PYTHON=y - """ - - class TestPy3BmapTools(TestBmapTools): __test__ = True config = TestBmapTools.config + \ diff --git a/support/testing/tests/package/test_crudini.py b/support/testing/tests/package/test_crudini.py index e320d3207e..470a714eb6 100644 --- a/support/testing/tests/package/test_crudini.py +++ b/support/testing/tests/package/test_crudini.py @@ -33,14 +33,6 @@ class TestCrudiniBase(TestPythonPackageBase): self.assertEqual(out, ['this-is-the-magic-value']) -class TestCrudiniPy2(TestCrudiniBase): - __test__ = True - config = TestCrudiniBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - """ - - class TestCrudiniPy3(TestCrudiniBase): __test__ = True config = TestCrudiniBase.config + \ diff --git a/support/testing/tests/package/test_libftdi1.py b/support/testing/tests/package/test_libftdi1.py index 78c928484c..5c29dea04f 100644 --- a/support/testing/tests/package/test_libftdi1.py +++ b/support/testing/tests/package/test_libftdi1.py @@ -1,18 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Libftdi1(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_LIBFTDI1=y - BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS=y - """ - sample_scripts = ["tests/package/sample_libftdi1.py"] - timeout = 40 - - class TestPythonPy3Libftdi1(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python.py b/support/testing/tests/package/test_python.py index 60da8765c4..f29aff6624 100644 --- a/support/testing/tests/package/test_python.py +++ b/support/testing/tests/package/test_python.py @@ -39,20 +39,6 @@ class TestPythonBase(infra.basetest.BRTest): self.assertEqual(exit_code, 1) -class TestPython2(TestPythonBase): - config = TestPythonBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - """ - - def test_run(self): - self.login() - self.version_test("Python 2") - self.math_floor_test() - self.libc_time_test() - self.zlib_test() - - class TestPython3(TestPythonBase): config = TestPythonBase.config + \ """ diff --git a/support/testing/tests/package/test_python_argh.py b/support/testing/tests/package/test_python_argh.py index de4b4cbe74..887d9acd46 100644 --- a/support/testing/tests/package/test_python_argh.py +++ b/support/testing/tests/package/test_python_argh.py @@ -27,15 +27,6 @@ class TestPythonArgh(TestPythonPackageBase): self.assertEqual(exit_code, 2) -class TestPythonPy2Argh(TestPythonArgh): - __test__ = True - config = TestPythonArgh.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_ARGH=y - """ - - class TestPythonPy3Argh(TestPythonArgh): __test__ = True config = TestPythonArgh.config + \ diff --git a/support/testing/tests/package/test_python_bitstring.py b/support/testing/tests/package/test_python_bitstring.py index 63b3fdb69c..bd358a2fc5 100644 --- a/support/testing/tests/package/test_python_bitstring.py +++ b/support/testing/tests/package/test_python_bitstring.py @@ -1,16 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Bitstring(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_BITSTRING=y - """ - sample_scripts = ["tests/package/sample_python_bitstring.py"] - - class TestPythonPy3Bitstring(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_can.py b/support/testing/tests/package/test_python_can.py index d509d05dbb..dba5539c5d 100644 --- a/support/testing/tests/package/test_python_can.py +++ b/support/testing/tests/package/test_python_can.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Can(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CAN=y - """ - sample_scripts = ["tests/package/sample_python_can.py"] - timeout = 40 - - class TestPythonPy3Can(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_cbor.py b/support/testing/tests/package/test_python_cbor.py index 9da3503763..23a1e3e701 100644 --- a/support/testing/tests/package/test_python_cbor.py +++ b/support/testing/tests/package/test_python_cbor.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Cbor(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CBOR=y - """ - sample_scripts = ["tests/package/sample_python_cbor_enc.py", - "tests/package/sample_python_cbor_dec.py"] - - class TestPythonPy3Cbor(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_click.py b/support/testing/tests/package/test_python_click.py index db57d3aa9f..0ee9702cce 100644 --- a/support/testing/tests/package/test_python_click.py +++ b/support/testing/tests/package/test_python_click.py @@ -26,15 +26,6 @@ class TestPythonClick(TestPythonPackageBase): self.assertEqual(exit_code, 2) -class TestPythonPy2Click(TestPythonClick): - __test__ = True - config = TestPythonClick.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CLICK=y - """ - - class TestPythonPy3Click(TestPythonClick): __test__ = True config = TestPythonClick.config + \ diff --git a/support/testing/tests/package/test_python_constantly.py b/support/testing/tests/package/test_python_constantly.py index 5be01c4f8c..edcb9bfd69 100644 --- a/support/testing/tests/package/test_python_constantly.py +++ b/support/testing/tests/package/test_python_constantly.py @@ -1,16 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Constantly(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CONSTANTLY=y - """ - sample_scripts = ["tests/package/sample_python_constantly.py"] - - class TestPythonPy3Constantly(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_gnupg.py b/support/testing/tests/package/test_python_gnupg.py index 0c71f6b6d0..8861115130 100644 --- a/support/testing/tests/package/test_python_gnupg.py +++ b/support/testing/tests/package/test_python_gnupg.py @@ -1,16 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2GnuPG(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_GNUPG=y - """ - sample_scripts = ["tests/package/sample_python_gnupg.py"] - - class TestPythonPy3GnuPG(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_incremental.py b/support/testing/tests/package/test_python_incremental.py index 49800d8937..4c53d61321 100644 --- a/support/testing/tests/package/test_python_incremental.py +++ b/support/testing/tests/package/test_python_incremental.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Incremental(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_INCREMENTAL=y - """ - sample_scripts = ["tests/package/sample_python_incremental.py"] - timeout = 30 - - class TestPythonPy3Incremental(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_passlib.py b/support/testing/tests/package/test_python_passlib.py index 7c85882bf8..e12e86d91b 100644 --- a/support/testing/tests/package/test_python_passlib.py +++ b/support/testing/tests/package/test_python_passlib.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Passlib(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PASSLIB=y - """ - sample_scripts = ["tests/package/sample_python_passlib.py"] - timeout = 30 - - class TestPythonPy3Passlib(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_pexpect.py b/support/testing/tests/package/test_python_pexpect.py index ba31cdbdbe..70037a7d3c 100644 --- a/support/testing/tests/package/test_python_pexpect.py +++ b/support/testing/tests/package/test_python_pexpect.py @@ -1,16 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Pexpect(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PEXPECT=y - """ - sample_scripts = ["tests/package/sample_python_pexpect.py"] - - class TestPythonPy3Pexpect(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_pynacl.py b/support/testing/tests/package/test_python_pynacl.py index f4dd54940a..cef8a7e780 100644 --- a/support/testing/tests/package/test_python_pynacl.py +++ b/support/testing/tests/package/test_python_pynacl.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Pynacl(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PYNACL=y - """ - sample_scripts = ["tests/package/sample_python_pynacl.py"] - timeout = 10 - - class TestPythonPy3Pynacl(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_pyyaml.py b/support/testing/tests/package/test_python_pyyaml.py index cd45a57b86..9d0a351f72 100644 --- a/support/testing/tests/package/test_python_pyyaml.py +++ b/support/testing/tests/package/test_python_pyyaml.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Pyyaml(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_PYYAML=y - """ - sample_scripts = ["tests/package/sample_python_pyyaml_enc.py", - "tests/package/sample_python_pyyaml_dec.py"] - - class TestPythonPy3Pyyaml(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_subprocess32.py b/support/testing/tests/package/test_python_subprocess32.py deleted file mode 100644 index d2878046d1..0000000000 --- a/support/testing/tests/package/test_python_subprocess32.py +++ /dev/null @@ -1,11 +0,0 @@ -from tests.package.test_python import TestPythonPackageBase - - -class TestPythonPy2Subprocess32(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_SUBPROCESS32=y - """ - sample_scripts = ["tests/package/sample_python_subprocess32.py"] diff --git a/support/testing/tests/package/test_python_ubjson.py b/support/testing/tests/package/test_python_ubjson.py index 85c707e292..a15dbd54b8 100644 --- a/support/testing/tests/package/test_python_ubjson.py +++ b/support/testing/tests/package/test_python_ubjson.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Ubjson(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_UBJSON=y - """ - sample_scripts = ["tests/package/sample_python_ubjson_enc.py", - "tests/package/sample_python_ubjson_dec.py"] - - class TestPythonPy3Ubjson(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \