Fix type confusion in manual CPU tests; delete dead testing code #1669
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bradlarsen
commented
Apr 14, 2020
Comment on lines
-19
to
-37
| class ROOperand: | ||
| """ Mocking class for operand ronly """ | ||
|
|
||
| def __init__(self, size, value): | ||
| self.size = size | ||
| self.value = value | ||
|
|
||
| def read(self): | ||
| return self.value & ((1 << self.size) - 1) | ||
|
|
||
|
|
||
| class RWOperand(ROOperand): | ||
| """ Mocking class for operand rw """ | ||
|
|
||
| def write(self, value): | ||
| self.value = value & ((1 << self.size) - 1) | ||
| return self.value | ||
|
|
||
|
|
There was a problem hiding this comment.
Note, this was already dead code, prior to these changes.
bradlarsen
commented
Apr 14, 2020
Comment on lines
-173
to
-188
| class ROOperand: | ||
| """ Mocking class for operand ronly """ | ||
|
|
||
| def __init__(self, size, value): | ||
| self.size = size | ||
| self.value = value | ||
|
|
||
| def read(self): | ||
| return self.value & ((1 << self.size) - 1) | ||
|
|
||
| class RWOperand(ROOperand): | ||
| """ Mocking class for operand rw """ | ||
|
|
||
| def write(self, value): | ||
| self.value = value & ((1 << self.size) - 1) | ||
| return self.value |
There was a problem hiding this comment.
Note, this was already dead code, prior to these changes.
bradlarsen
commented
Apr 14, 2020
Comment on lines
-189
to
-197
|
|
||
| def setUp(self): | ||
| mem = MockMemory() | ||
| self.cpu = I386Cpu(mem) # TODO reset cpu in between tests... | ||
| # TODO mock getchar/putchar in case the instruction accesses memory directly | ||
|
|
||
| def tearDown(self): | ||
| self.cpu = None | ||
|
|
There was a problem hiding this comment.
Note: the self.cpu parameter was only used in a few tests in this file previously. So instead of creating & destroying it around each test, I changed the code to explicitly create a Cpu object only within the test cases that use it.
ehennenfent
approved these changes
Apr 16, 2020
There was a problem hiding this comment.
LGTM. Not much to comment here since it looks like most of the diff is s/self.cpu/cpu/. I'm assuming this will make #1660 easier.
ekilmer
added a commit
that referenced
this pull request
Apr 23, 2020
* master: (28 commits) Rework syscall invocation for proper behavior under typeguard (#1672) printable_bytes (#1671) Fix several incorrect type hints (#1668) Add type hints to several parts of Manticore (#1667) Fix type confusion in manual CPU tests; delete dead testing code (#1669) Rework WASM Imports and Fix Typos (#1666) Work on "Model is not Available" errors in tests (#1659) Fix TypeGuard Errors in WASM Module (#1601) Remove unused arg ans separate output from workspace (#1651) Add a badge to README.md for LGTM (#1647) Fix 2 problems in Linux `sys_open` support & add type hints (#1657) Fix LGTM Errors (#1656) Delay WASM Branch Condition Concretization (#1641) Add feature for SymbolicSocket through sys_accept (#1618) Add a bunch of type hints & fix a few issues with Linux platform emulation (#1645) Bump to CheckoutV2 (#1654) Add support for `sys_arm_fadvise64_64` (#1648) Add __slots__ to expressions (#1635) Swap remaining uses of `Z3Solver()` to use the singleton interface (#1649) CI: have pytest report 100 slowest tests (#1646) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It turns out that most of
tests/native/mockmem.pywas dead code to begin with. Additionally, usingtypeguardduring testing (see #1584), it is revealed that the use oftests.native.mockmem.Memoryturns some type hints elsewhere into lies (since the mocked version isn't a subclass ofMemory).The simplest fix: massage the single file that uses
tests.native.mockmem.Memory, and then delete that whole file.