made all tests run with Python 2.6 that has unittest2 installed. Added basic tox...

diff --git a/.hgignore b/.hgignore
index 5ada10a50e1c4b2511755abc8bbba0d57955e22a..b5fbddea2f82adb245f1aad25b79753a4d2b2be9 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -2,6 +2,7 @@ syntax: glob
 
 *.pyc
 .coverage
+.tox
 htmlcov
 tags
 build

diff --git a/test/run_all_unittests.py b/test/run_all_unittests.py
index 54ad5f0bb2c748a14df043580a8e042c3f08f637..100744ae14166d429174f63cc6d2e0e93aa51069 100755 (executable)
--- a/test/run_all_unittests.py
+++ b/test/run_all_unittests.py
@@ -7,13 +7,16 @@
 # Eli Bendersky (eliben@gmail.com)
 # This code is in the public domain
 #-------------------------------------------------------------------------------
-from unittest import TestLoader, TextTestRunner
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 
 if __name__ == '__main__':
     try:
-        tests = TestLoader().discover('test', 'test*.py', 'test')
-        TextTestRunner().run(tests)
+        tests = unittest.TestLoader().discover('test', 'test*.py', 'test')
+        unittest.TextTestRunner().run(tests)
     except ImportError as err:
         print err
         print '!! Please execute from the root directory of pyelftools'

diff --git a/test/test_callframe.py b/test/test_callframe.py
index 30e405b511d352b5de2e0290dd70a05562e2d062..3fe1b9a6b62c16b68775c1e5d1e893701eabfe3d 100644 (file)
--- a/test/test_callframe.py
+++ b/test/test_callframe.py
@@ -1,4 +1,8 @@
-import sys, unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+import sys
 from cStringIO import StringIO
 
 sys.path.extend(['.', '..'])

diff --git a/test/test_dwarf_expr.py b/test/test_dwarf_expr.py
index 8e293db9cf8412a19ad0dd14ae636e1cc33e0b3d..d740eaf081060d79c6aa4837f76c3058f90fdf87 100644 (file)
--- a/test/test_dwarf_expr.py
+++ b/test/test_dwarf_expr.py
@@ -1,4 +1,8 @@
-import sys, unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+import sys
 from cStringIO import StringIO
 
 sys.path.extend(('..', '.'))

diff --git a/test/test_dwarf_lineprogram.py b/test/test_dwarf_lineprogram.py
index 56d96c3c6ae37f7ab57722130a002694469eabda..d3e11006875c18bc419d97fbab3714744b506f65 100644 (file)
--- a/test/test_dwarf_lineprogram.py
+++ b/test/test_dwarf_lineprogram.py
@@ -1,4 +1,8 @@
-import sys, unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+import sys
 from cStringIO import StringIO
 
 sys.path.extend(['.', '..'])

diff --git a/test/test_dwarf_structs.py b/test/test_dwarf_structs.py
index a1e30d75a60083d6cd392733765328037b58e546..d85ee0fe6f535c770a4004dd31a41ac5ab95daf5 100644 (file)
--- a/test/test_dwarf_structs.py
+++ b/test/test_dwarf_structs.py
@@ -1,4 +1,8 @@
-import sys, unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+import sys
 
 sys.path.extend(['.', '..'])
 from elftools.dwarf.structs import DWARFStructs

diff --git a/test/test_utils.py b/test/test_utils.py
index 54a09bb4f2ab4c57a1b479b5e93e0a2e7605c8fa..a30ac3a7484eb10b716bf32d0e23550992f15e44 100644 (file)
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -1,4 +1,8 @@
-import sys, unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+import sys
 from cStringIO import StringIO
 from random import randint
 

diff --git a/tox.ini b/tox.ini
new file mode 100644 (file)
index 0000000..a91cd2f
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,12 @@
+[tox]
+envlist = py27,py26
+
+[testenv]
+commands =
+    python test/run_all_unittests.py
+    python test/run_readelf_tests.py
+
+[testenv:py26]
+deps =
+    unittest2
+