about summary refs log tree commit diff stats
path: root/tests/test_snapshot.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test_snapshot.py')
-rw-r--r--tests/test_snapshot.py23
1 files changed, 12 insertions, 11 deletions
diff --git a/tests/test_snapshot.py b/tests/test_snapshot.py
index 0463418..789caf5 100644
--- a/tests/test_snapshot.py
+++ b/tests/test_snapshot.py
@@ -17,21 +17,22 @@ def test_register_access_empty_state(state, reg):
     with pytest.raises(RegisterAccessError):
         state.read_register(reg)
 
-def test_register_read_write(self):
-    state = ProgramState(self.arch)
+def test_register_read_write(arch):
+    state = ProgramState(arch)
     for reg in x86.regnames:
         state.set_register(reg, 0x42)
     for reg in x86.regnames:
         val = state.read_register(reg)
         assert val == 0x42
 
-def test_register_aliases_empty_state(self):
-    state = ProgramState(self.arch)
-    for reg in self.arch.all_regnames:
-        with pytest.raises(RegisterAccessError): state.read_register(reg)
+def test_register_aliases_empty_state(arch):
+    state = ProgramState(arch)
+    for reg in arch.all_regnames:
+        with pytest.raises(RegisterAccessError): 
+            state.read_register(reg)
 
-def test_register_aliases_read_write(self):
-    state = ProgramState(self.arch)
+def test_register_aliases_read_write(arch):
+    state = ProgramState(arch)
     for reg in ['EAX', 'EBX', 'ECX', 'EDX']:
         state.set_register(reg, 0xa0ff0)
 
@@ -45,10 +46,10 @@ def test_register_aliases_read_write(self):
                 'RAX', 'RBX', 'RCX', 'RDX']:
         assert state.read_register(reg) == 0xa0ff0, reg
 
-def test_flag_aliases(self):
+def test_flag_aliases(arch):
     flags = ['CF', 'PF', 'AF', 'ZF', 'SF', 'TF', 'IF', 'DF', 'OF',
              'IOPL', 'NT', 'RF', 'VM', 'AC', 'VIF', 'VIP', 'ID']
-    state = ProgramState(self.arch)
+    state = ProgramState(arch)
 
     state.set_register('RFLAGS', 0)
     for flag in flags:
@@ -56,7 +57,7 @@ def test_flag_aliases(self):
 
     state.set_register('RFLAGS',
                        x86.compose_rflags({'ZF': 1, 'PF': 1, 'OF': 0}))
-    assert state.read_register('ZF') == 1, self.arch.get_reg_accessor('ZF')
+    assert state.read_register('ZF') == 1, arch.get_reg_accessor('ZF')
     assert state.read_register('PF') == 1
     assert state.read_register('OF') == 0
     assert state.read_register('AF') == 0