From d75adaf1716161e101e4e132530053b7a744ecc8 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Thu, 4 Jun 2020 20:13:40 +0100 Subject: [PATCH] no global variables in test suites --- src/soc/fu/compunits/test/test_logical_compunit.py | 4 +--- src/soc/fu/logical/test/test_pipe_caller.py | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/soc/fu/compunits/test/test_logical_compunit.py b/src/soc/fu/compunits/test/test_logical_compunit.py index 2591bcd4..a5e9f714 100644 --- a/src/soc/fu/compunits/test/test_logical_compunit.py +++ b/src/soc/fu/compunits/test/test_logical_compunit.py @@ -1,9 +1,7 @@ import unittest from soc.decoder.power_enums import (XER_bits, Function) -# XXX bad practice: use of global variables from soc.fu.logical.test.test_pipe_caller import LogicalTestCase, get_cu_inputs -from soc.fu.logical.test.test_pipe_caller import test_data from soc.fu.compunits.compunits import LogicalFunctionUnit from soc.fu.compunits.test.test_compunit import TestRunner @@ -66,7 +64,7 @@ class LogicalTestRunner(TestRunner): if __name__ == "__main__": unittest.main(exit=False) suite = unittest.TestSuite() - suite.addTest(LogicalTestRunner(test_data)) + suite.addTest(LogicalTestRunner(LogicalTestCase.test_data)) runner = unittest.TextTestRunner() runner.run(suite) diff --git a/src/soc/fu/logical/test/test_pipe_caller.py b/src/soc/fu/logical/test/test_pipe_caller.py index f64ea531..c74dbe45 100644 --- a/src/soc/fu/logical/test/test_pipe_caller.py +++ b/src/soc/fu/logical/test/test_pipe_caller.py @@ -82,17 +82,16 @@ def set_alu_inputs(alu, dec2, sim): # massively. Before, it took around 1 minute on my computer, now it # takes around 3 seconds -test_data = [] - class LogicalTestCase(FHDLTestCase): + test_data = [] def __init__(self, name): super().__init__(name) self.test_name = name def run_tst_program(self, prog, initial_regs=[0] * 32, initial_sprs={}): tc = TestCase(prog, initial_regs, initial_sprs, self.test_name) - test_data.append(tc) + self.test_data.append(tc) def test_rand(self): insns = ["and", "or", "xor"] @@ -260,7 +259,7 @@ class TestRunner(FHDLTestCase): if __name__ == "__main__": unittest.main(exit=False) suite = unittest.TestSuite() - suite.addTest(TestRunner(test_data)) + suite.addTest(TestRunner(LogicalTestCase.test_data)) runner = unittest.TextTestRunner() runner.run(suite) -- 2.30.2