not_found handler shouldn't care about the as header

CHANGES.rst

@@ -5,7 +5,8 @@ Changes by Version
 0.16.1 (unreleased)
 -------------------
 
-- Nothing changed yet.
+- Fixed a bug where the 'not found' handler would incorrectly return
+  serialization mismatch errors..
 
 
 0.16.0 (2015-08-25)

tchannel/schemes/json.py

@@ -65,7 +65,7 @@ def __call__(self, service, endpoint, body=None, headers=None,
         :param string headers:
             A raw headers block to provide to the endpoint.
         :param int timeout:
-            How long to wait before raising a ``TimeoutError`` - this
+            How long to wait (in ms) before raising a ``TimeoutError`` - this
             defaults to ``tchannel.glossary.DEFAULT_TIMEOUT``.
         :param string retry_on:
             What events to retry on - valid values can be found in

tchannel/schemes/raw.py

@@ -60,7 +60,7 @@ def __call__(self, service, endpoint, body=None, headers=None,
         :param string headers:
             A raw headers block to provide to the endpoint.
         :param int timeout:
-            How long to wait before raising a ``TimeoutError`` - this
+            How long to wait (in ms) before raising a ``TimeoutError`` - this
             defaults to ``tchannel.glossary.DEFAULT_TIMEOUT``.
         :param string retry_on:
             What events to retry on - valid values can be found in

tchannel/tornado/dispatch.py

@@ -141,13 +141,20 @@ def handle_call(self, request, connection):
         tchannel.event_emitter.fire(EventType.before_receive_request, request)
 
         handler = self.handlers.get(request.endpoint)
+
         if handler is None:
             handler = self.handlers[self.FALLBACK]
 
-        if request.headers.get('as', None) != handler.req_serializer.name:
+        requested_as = request.headers.get('as', None)
+        expected_as = handler.req_serializer.name
+
+        if request.endpoint in self.handlers and requested_as != expected_as:
             connection.send_error(
                 ErrorCode.bad_request,
-                "Invalid arg scheme in request header",
+                "Your serialization was '%s' but the server expected '%s'" % (
+                    requested_as,
+                    expected_as,
+                ),
                 request.id,
             )
             raise gen.Return(None)

tests/test_tchannel.py

@@ -233,19 +233,39 @@ def endpoint(request):
 
 @pytest.mark.gen_test
 @pytest.mark.call
-def test_endpoint_not_found():
+def test_endpoint_not_found_with_raw_request():
     server = TChannel(name='server')
     server.listen()
 
     tchannel = TChannel(name='client')
 
-    with pytest.raises(errors.BadRequestError):
+    with pytest.raises(errors.BadRequestError) as e:
         yield tchannel.raw(
             service='server',
             hostport=server.hostport,
             endpoint='foo',
         )
 
+    assert "Endpoint 'foo' is not defined" in e.value
+
+
+@pytest.mark.gen_test
+@pytest.mark.call
+def test_endpoint_not_found_with_json_request():
+    server = TChannel(name='server')
+    server.listen()
+
+    tchannel = TChannel(name='client')
+
+    with pytest.raises(errors.BadRequestError) as e:
+        yield tchannel.json(
+            service='server',
+            hostport=server.hostport,
+            endpoint='foo',
+        )
+
+    assert "Endpoint 'foo' is not defined" in e.value
+
 
 def test_event_hook_register():
     server = TChannel(name='server')