Cleanup; better test file paths

pwndbg/commands/misc.py

@@ -13,7 +13,6 @@
 import pwndbg.auxv
 import pwndbg.commands
 import pwndbg.regs
-import pwndbg.services
 import pwndbg.symbol
 
 _errno.errorcode[0] = 'OK'

tests/__init__.py

@@ -0,0 +1,6 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from . import binaries

tests/binaries/__init__.py

@@ -0,0 +1,13 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import os
+
+from . import old_bash
+
+path = os.path.dirname(__file__)
+
+def get(x):
+    return os.path.join(path, x)

pwndbg/services/misc.py → tests/binaries/old_bash/__init__.py

@@ -1,5 +1,11 @@
-from __future__ import print_function
-from __future__ import division
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 from __future__ import unicode_literals
-import pwndbg.commands
+
+import os
+
+path = os.path.dirname(__file__)
+
+def get(x):
+    return os.path.join(path, x)

tests/conftest.py

@@ -1,10 +1,11 @@
 """
 This file should consist of global test fixtures.
 """
-from __future__ import print_function
-from __future__ import division
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 from __future__ import unicode_literals
+
 import gdb
 import pytest
 

tests/test_loads.py

@@ -1,15 +1,17 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 
 import codecs
 import re
 import subprocess
 import tempfile
 
+import tests
+
 
 def run_gdb_with_script(binary='', core='', pybefore=None, pyafter=None):
     """
@@ -57,8 +59,8 @@ def run_gdb_with_script(binary='', core='', pybefore=None, pyafter=None):
     return output
 
 
-BASH_BIN = './tests/corefiles/bash/binary'
-BASH_CORE = './tests/corefiles/bash/core'
+BASH_BIN = tests.binaries.old_bash.get('binary')
+BASH_CORE = tests.binaries.old_bash.get('core')
 
 
 def test_loads_pure_gdb_without_crashing():

tests/test_memory.py

@@ -31,4 +31,3 @@ def test_memory_read_write(entry_binary):
     val = bytes('Z' * 8, 'utf8')
     pwndbg.memory.write(stack_addr, val)
     assert pwndbg.memory.read(stack_addr, len(val)+4) == bytearray('Z'*8 + 'YYXX', 'utf8')
-