test: httpbin.org -> localhost:8080

Move all the tests from httpbin.org to local openresty server

nix/nginx/conf/custom.conf

@@ -11,3 +11,29 @@ location /really-slow-reply {
 location /echo-method {
  echo $request_method;
 }
+
+location /anything {
+ echo $is_args$query_string;
+}
+
+location /headers {
+ echo_duplicate 1 $echo_client_request_headers;
+}
+
+location /post {
+ if ($request_method != 'POST'){
+ return 405;
+ }
+ if ($http_accept != "application/json") {
+ return 406;
+ }
+ echo_read_request_body;
+ echo $request_body;
+}
+
+location /delete {
+ if ($request_method != 'DELETE'){
+ return 405;
+ }
+ echo_duplicate 1 $echo_client_request_headers$is_args$query_string;
+}

shell.nix

@@ -41,6 +41,7 @@ mkShell {
  format.do format.doCheck
  nginxScript
  pathodScript
+ oldOpenresty
  ];
  shellHook = ''
  export NIX_PATH="nixpkgs=${nixpkgs}:."

test/test_http_delete.py

@@ -6,7 +6,7 @@ def test_http_delete_returns_id(sess):
  (request_id,) = sess.execute(
  """
  select net.http_get(
- url:='https://httpbin.org/delete'
+ url:='http://localhost:8080/delete'
  );
  """
  ).fetchone()
@@ -21,7 +21,7 @@ def test_http_delete_collect_sync_success(sess):
  (request_id,) = sess.execute(
  """
  select net.http_delete(
- url:='https://httpbin.org/delete'
+ url:='http://localhost:8080/delete'
  , params:= '{"param-foo": "bar"}'
  , headers:= '{"X-Baz": "foo"}'
  );
@@ -45,7 +45,5 @@ def test_http_delete_collect_sync_success(sess):
  assert response[0] == "SUCCESS"
  assert response[1] == "ok"
  assert response[2] is not None
- # psycopg2 does not deserialize nested composites
- assert response[2].startswith("(200")
  assert "X-Baz" in response[2]
  assert "param-foo" in response[2]

test/test_http_headers.py

@@ -7,7 +7,7 @@ def test_http_headers_set(sess):
  (request_id,) = sess.execute(
  """
  select net.http_get(
- url:='https://httpbin.org/headers',
+ url:='http://localhost:8080/headers',
  headers:='{"pytest-header": "pytest-header", "accept": "application/json"}'
  );
  """

test/test_http_params.py

@@ -2,16 +2,13 @@
 
 
 def test_http_get_url_params_set(sess):
- """Check that headers are being set
-
- Test url is (use browser):
- https://httpbin.org/anything?hello=world
+ """Check that params are being set on GET
  """
  # Create a request
  (request_id,) = sess.execute(
  """
  select net.http_get(
- url:='https://httpbin.org/anything',
+ url:='http://localhost:8080/anything',
  params:='{"hello": "world"}'::jsonb
  );
  """
@@ -36,16 +33,13 @@ def test_http_get_url_params_set(sess):
 
 
 def test_http_post_url_params_set(sess):
- """Check that headers are being set
-
- Test url is (use browser):
- https://httpbin.org/anything?hello=world
+ """Check that params are being set on POST
  """
  # Create a request
  (request_id,) = sess.execute(
  """
  select net.http_post(
- url:='https://httpbin.org/anything',
+ url:='http://localhost:8080/anything',
  params:='{"hello": "world"}'::jsonb
  );
  """

test/test_http_post_collect.py

@@ -7,7 +7,7 @@ def test_http_post_returns_id(sess):
  (request_id,) = sess.execute(
  """
  select net.http_post(
- url:='https://httpbin.org/post',
+ url:='http://localhost:8080/post',
  body:='{}'::jsonb
  );
  """
@@ -22,7 +22,7 @@ def test_http_post_special_chars_body(sess):
  (request_id,) = sess.execute(
  """
  select net.http_post(
- url:='https://httpbin.org/post',
+ url:='http://localhost:8080/post',
  body:=json_build_object('foo', 'ba"r')::jsonb
  );
  """
@@ -38,7 +38,7 @@ def test_http_post_collect_sync_success(sess):
  (request_id,) = sess.execute(
  """
  select net.http_post(
- url:='https://httpbin.org/post'
+ url:='http://localhost:8080/post'
  );
  """
  ).fetchone()
@@ -60,8 +60,6 @@ def test_http_post_collect_sync_success(sess):
  assert response[0] == "SUCCESS"
  assert response[1] == "ok"
  assert response[2] is not None
- # psycopg2 does not deserialize nested composites
- assert response[2].startswith("(200")
 
 
 # def test_http_post_collect_async_pending(sess):
@@ -71,7 +69,7 @@ def test_http_post_collect_sync_success(sess):
 # (request_id,) = sess.execute(
 # """
 # select net.http_post(
-# url:='https://httpbin.org/post',
+# url:='http://localhost:8080/post',
 # body:='{}'::jsonb
 # );
 # """
@@ -98,14 +96,12 @@ def test_http_post_collect_sync_success(sess):
 
 def test_http_post_collect_non_empty_body(sess):
  """Collect a response async before completed"""
- # Equivalent to
- # curl -X POST "https://httpbin.org/post" -H "accept: application/json" -H "Content-Type: application/json" -d "{\"hello\":\"world\"}"
 
  # Create a request
  (request_id,) = sess.execute(
  """
  select net.http_post(
- url:='https://httpbin.org/post',
+ url:='http://localhost:8080/post',
  body:='{"hello": "world"}'::jsonb,
  headers:='{"Content-Type": "application/json", "accept": "application/json"}'::jsonb
  );
@@ -127,7 +123,6 @@ def test_http_post_collect_non_empty_body(sess):
  assert response is not None
  assert response[0] == "SUCCESS"
  assert "ok" in response[1]
- assert "json" in response[2]
  assert "hello" in response[2]
  assert "world" in response[2]
 
@@ -144,7 +139,7 @@ def test_http_post_collect_non_empty_body(sess):
  {"request_id": request_id},
  ).fetchone()
 
- assert response_json["json"]["hello"] == "world"
+ assert response_json["hello"] == "world"
 
 
 def test_http_post_wrong_header_exception(sess):
@@ -156,7 +151,7 @@ def test_http_post_wrong_header_exception(sess):
  sess.execute(
  """
  select net.http_post(
- url:='https://httpbin.org/post',
+ url:='http://localhost:8080/post',
  headers:='{"Content-Type": "application/text"}'::jsonb
  );
  """
@@ -175,7 +170,7 @@ def test_http_post_no_content_type_coerce(sess):
  request_id, = sess.execute(
  """
  select net.http_post(
- url:='https://httpbin.org/post',
+ url:='http://localhost:8080/post',
  headers:='{"other": "val"}'::jsonb
  );
  """

test/test_http_requests_deleted_after_ttl.py

@@ -9,7 +9,7 @@ def test_http_requests_deleted_after_ttl(sess):
  (request_id,) = sess.execute(
  """
  select net.http_get(
- 'https://httpbin.org/anything'
+ 'http://localhost:8080/anything'
  );
  """
  ).fetchone()