Fix for test_log_buf to work with python3

In python3, output needs to be converted from ascii to str before the "error_msg in str" test will succeed. This change should be backwards compatible with python2. Signed-off-by: Brenden Blanco <[email protected]>
linuxzjs · Feb 9, 2017 · bc93238 · bc93238
1 parent 7f1c3b2
commit bc93238
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
@@ -17,7 +17,7 @@ endif()
 add_test(NAME py_test_stat1_b WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
  COMMAND ${TEST_WRAPPER} py_stat1_b namespace ${CMAKE_CURRENT_SOURCE_DIR}/test_stat1.py test_stat1.b proto.b)
 add_test(NAME py_test_bpf_log WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMAND ${TEST_WRAPPER} py_bpf_prog namespace ${CMAKE_CURRENT_SOURCE_DIR}/test_bpf_log.py)
+ COMMAND ${TEST_WRAPPER} py_bpf_prog sudo ${CMAKE_CURRENT_SOURCE_DIR}/test_bpf_log.py)
 add_test(NAME py_test_stat1_c WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
  COMMAND ${TEST_WRAPPER} py_stat1_c namespace ${CMAKE_CURRENT_SOURCE_DIR}/test_stat1.py test_stat1.c)
 #add_test(NAME py_test_xlate1_b WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/tests/python/test_bpf_log.py b/tests/python/test_bpf_log.py
@@ -51,7 +51,7 @@ def test_log_debug(self):
  except Exception:
  self.fp.flush()
  self.fp.seek(0)
- self.assertEqual(error_msg in self.fp.read(), True)
+ self.assertEqual(error_msg in self.fp.read().decode(), True)
 
 
  def test_log_no_debug(self):
@@ -61,7 +61,7 @@ def test_log_no_debug(self):
  except Exception:
  self.fp.flush()
  self.fp.seek(0)
- self.assertEqual(error_msg in self.fp.read(), True)
+ self.assertEqual(error_msg in self.fp.read().decode(), True)
 
 
 if __name__ == "__main__":