Merge GT-RAIL pull request #19

roehling · roehling · commit 58c17f8b4fa2 · 2021-01-12T14:06:24.000+01:00
diff --git a/src/http_reply.cpp b/src/http_reply.cpp
@@ -349,9 +349,7 @@ bool FilesystemHttpRequestHandler::operator()(const HttpRequest &request, boost:
       return false;
     }
   }
-  else {
-    return false;
-  }
+  return false;
 }
 
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,9 +1,6 @@
 add_executable(test_web_server EXCLUDE_FROM_ALL test_web_server.cpp)
 target_link_libraries(test_web_server ${PROJECT_NAME} ${catkin_LIBRARIES})
-include_directories(
-  ${catkin_INCLUDE_DIRS}
-)
-
+target_include_directories(test_web_server PRIVATE ${catkin_INCLUDE_DIRS})
 
 if(TARGET tests)
     add_dependencies(tests
diff --git a/test/simple_http_requests_test.py b/test/simple_http_requests_test.py
@@ -1,6 +1,10 @@
 #! /usr/bin/env python
 
-import httplib
+import sys
+if sys.version_info > (3,):
+    import http.client as httplib
+else:
+    import httplib
 import rospy
 import unittest
 import time
@@ -48,17 +52,17 @@ def test_default_action(self):
         self.conn.request("GET", "/a_static_response")
         response = self.conn.getresponse()
         self.assertEqual(200, response.status)
-        self.assertEqual("A RESPONSE", response.read())
+        self.assertEqual(b"A RESPONSE", response.read())
 
     def test_http_echo1(self):
-        test_content = "hello HELLO"*1000 # make sure to exceed MTU
+        test_content = b"hello HELLO"*1000 # make sure to exceed MTU
         self.conn.request("GET", "/http_body_echo", test_content)
         response = self.conn.getresponse()
         self.assertEqual(200, response.status)
         self.assertEqual(test_content, response.read())
 
     def test_http_echo2(self):
-        test_content = "THIS is A test"*1000 # make sure to exceed MTU
+        test_content = b"THIS is A test"*1000 # make sure to exceed MTU
         self.conn.request("POST", "/http_body_echo", test_content)
         response = self.conn.getresponse()
         self.assertEqual(200, response.status)
@@ -68,25 +72,25 @@ def test_http_path_echo(self):
         self.conn.request("GET", "/http_path_echo/this_is_a_test")
         response = self.conn.getresponse()
         self.assertEqual(200, response.status)
-        self.assertEqual("/http_path_echo/this_is_a_test", response.read())
+        self.assertEqual(b"/http_path_echo/this_is_a_test", response.read())
 
     def test_http_query_echo(self):
         self.conn.request("GET", "/http_query_echo?hello=1&b=test&c=10")
         response = self.conn.getresponse()
         self.assertEqual(200, response.status)
-        self.assertEqual("b=test\nc=10\nhello=1\n", response.read())
+        self.assertEqual(b"b=test\nc=10\nhello=1\n", response.read())
 
     def test_file(self):
         self.conn.request("GET", "/test_file")
         response = self.conn.getresponse()
         self.assertEqual(200, response.status)
-        self.assertEqual("<html></html>\n", response.read())
+        self.assertEqual(b"<html></html>\n", response.read())
 
     def test_file_from_filesystem(self):
         self.conn.request("GET", "/test_files/test_dir/test_file.txt")
         response = self.conn.getresponse()
         self.assertEqual(200, response.status)
-        self.assertEqual("test\n", response.read())
+        self.assertEqual(b"test\n", response.read())
 
     def test_directory_listing_forbidden_from_filesystem1(self):
         self.conn.request("GET", "/test_files/test_dir/")
diff --git a/test/websocket_test.py b/test/websocket_test.py
@@ -20,15 +20,15 @@ def test_ok(self):
         self.ws.send("hi")
         self.assertEqual("hi", self.ws.recv())
 
-        self.ws.ping("test ping")
+        self.ws.ping(b"test ping")
         ping_echo = self.ws.recv_frame()
         self.assertEqual(9, ping_echo.opcode)
-        self.assertEqual("test ping", ping_echo.data)
+        self.assertEqual(b"test ping", ping_echo.data)
 
-        self.ws.pong("test pong")
+        self.ws.pong(b"test pong")
         pong_echo = self.ws.recv_frame()
         self.assertEqual(10, pong_echo.opcode)
-        self.assertEqual("test pong", pong_echo.data)
+        self.assertEqual(b"test pong", pong_echo.data)
 
 if __name__ == '__main__':
     time.sleep(1) # ensure server is up

Original file line number	Diff line number	Diff line change
`@@ -349,9 +349,7 @@ bool FilesystemHttpRequestHandler::operator()(const HttpRequest &request, boost:`
`349`	`349`	`return false;`
`350`	`350`	`}`
`351`	`351`	`}`
`352`		`- else {`
`353`		`- return false;`
`354`		`- }`
	`352`	`+ return false;`
`355`	`353`	`}`
`356`	`354`
`357`	`355`