diff options
| author | Tushar Gohad <tushar.gohad@intel.com> | 2014-04-20 13:17:49 -0700 |
|---|---|---|
| committer | Tushar Gohad <tushar.gohad@intel.com> | 2014-04-20 14:16:25 -0700 |
| commit | f1e317fa2c3889be48599e3daf21b6df89474875 (patch) | |
| tree | 2abf2f0a19b1be6ccfa01a5b6f077e45a97ac5c5 | |
| parent | 03d849273521fd13fae9534db3bc79f75fea9dc2 (diff) | |
| download | pyeclib-f1e317fa2c3889be48599e3daf21b6df89474875.tar.gz | |
ec_test: Python3 chr() returns an int, remove ord() call
Signed-off-by: Tushar Gohad <tushar.gohad@intel.com>
| -rw-r--r-- | src/python/pyeclib/ec_test.py | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/python/pyeclib/ec_test.py b/src/python/pyeclib/ec_test.py index 0cd3d1a..3972369 100644 --- a/src/python/pyeclib/ec_test.py +++ b/src/python/pyeclib/ec_test.py @@ -31,6 +31,15 @@ import os from string import ascii_letters + +if sys.version < '3': + def b2i(b): + return ord(b) +else: + def b2i(b): + return b + + class TestNullDriver(unittest.TestCase): def setUp(self): @@ -159,8 +168,9 @@ class TestPyECLibDriver(unittest.TestCase): i = 0 for fragment in fragments: if i == fragment_to_corrupt: - corrupted_fragment = fragment[ - :100] + chr(ord(fragment[100]) + 1) + fragment[101:] + corrupted_fragment = fragment[:100] +\ + (str(chr((b2i(fragment[100]) + 0x1) + % 0xff))).encode('utf-8') + fragment[101:] fragment_metadata_list.append( pyeclib_driver.get_metadata(corrupted_fragment)) else: @@ -255,8 +265,9 @@ class TestPyECLibDriver(unittest.TestCase): i = 0 for fragment in fragments: if i == fragment_to_corrupt: - corrupted_fragment = fragment[ - :100] + chr(ord(fragment[100]) + 1) + fragment[101:] + corrupted_fragment = fragment[:100] +\ + (str(chr((b2i(fragment[100]) + 0x1) + % 0xff))).encode('utf-8') + fragment[101:] fragment_metadata_list.append( pyeclib_driver.get_metadata(corrupted_fragment)) else: @@ -430,7 +441,8 @@ class TestPyECLibDriver(unittest.TestCase): with open("test_files/%s" % filename, "r") as fp: whole_file_str = fp.read() - orig_fragments = pyeclib_driver.encode(whole_file_str.encode('utf-8')) + orig_fragments = pyeclib_driver.encode( + whole_file_str.encode('utf-8')) for iter in range(self.num_iterations): num_missing = 2 |