From 9bbce01ed4ff93b26b435d5ab356407d48c2a424 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 10 Dec 2023 11:25:08 +0100 Subject: Merging upstream version 2.3.1: - properly handles big-endian data in `iputils.py` (Closes: #1057031). Signed-off-by: Daniel Baumann --- test/test-defs.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'test/test-defs.py') diff --git a/test/test-defs.py b/test/test-defs.py index 3f8b02b..9098ef0 100755 --- a/test/test-defs.py +++ b/test/test-defs.py @@ -1,4 +1,5 @@ #!/usr/bin/python3 +import contextlib import os import sys import unittest @@ -9,13 +10,17 @@ class MockLibnvmeTestCase(unittest.TestCase): '''Testing defs.py by mocking the libnvme package''' def test_libnvme_version(self): - # For unknown reasons, this test does - # not work when run from GitHub Actions. - if not os.getenv('GITHUB_ACTIONS'): - from staslib import defs + # Ensure that we re-import staslib & staslib.defs if the current Python + # process has them already imported. + with contextlib.suppress(KeyError): + sys.modules.pop('staslib.defs') + with contextlib.suppress(KeyError): + sys.modules.pop('staslib') - libnvme_ver = defs.LIBNVME_VERSION - self.assertEqual(libnvme_ver, '?.?') + from staslib import defs + + libnvme_ver = defs.LIBNVME_VERSION + self.assertEqual(libnvme_ver, '?.?') @classmethod def setUpClass(cls): # called once before all the tests -- cgit v1.2.3