From e7b01292e96172a1d716fc80c7df628e00c2b83e Mon Sep 17 00:00:00 2001
From: Karl Gutwin <karl@bioteam.net>
Date: Thu, 8 Nov 2018 13:57:44 -0500
Subject: [PATCH] Fix test failures in server mode

---
 moto/dynamodb2/responses.py                        |  6 +++++-
 moto/server.py                                     | 11 +++++++----
 tests/test_dynamodbstreams/test_dynamodbstreams.py |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/moto/dynamodb2/responses.py b/moto/dynamodb2/responses.py
index d2bf99bfe..79dd749e2 100644
--- a/moto/dynamodb2/responses.py
+++ b/moto/dynamodb2/responses.py
@@ -174,7 +174,11 @@ class DynamoHandler(BaseResponse):
             throughput = self.body["ProvisionedThroughput"]
             table = self.dynamodb_backend.update_table_throughput(name, throughput)
         if 'StreamSpecification' in self.body:
-            table = self.dynamodb_backend.update_table_streams(name, self.body['StreamSpecification'])
+            try:
+                table = self.dynamodb_backend.update_table_streams(name, self.body['StreamSpecification'])
+            except ValueError:
+                er = 'com.amazonaws.dynamodb.v20111205#ResourceInUseException'
+                return self.error(er, 'Cannot enable stream')
 
         return dynamo_json_dump(table.describe())
 
diff --git a/moto/server.py b/moto/server.py
index ba2470478..5ad02d383 100644
--- a/moto/server.py
+++ b/moto/server.py
@@ -80,10 +80,13 @@ class DomainDispatcherApplication(object):
 
                 region = 'us-east-1'
             if service == 'dynamodb':
-                dynamo_api_version = environ['HTTP_X_AMZ_TARGET'].split("_")[1].split(".")[0]
-                # If Newer API version, use dynamodb2
-                if dynamo_api_version > "20111205":
-                    host = "dynamodb2"
+                if environ['HTTP_X_AMZ_TARGET'].startswith('DynamoDBStreams'):
+                    host = 'dynamodbstreams'
+                else:
+                    dynamo_api_version = environ['HTTP_X_AMZ_TARGET'].split("_")[1].split(".")[0]
+                    # If Newer API version, use dynamodb2
+                    if dynamo_api_version > "20111205":
+                        host = "dynamodb2"
             else:
                 host = "{service}.{region}.amazonaws.com".format(
                     service=service, region=region)
diff --git a/tests/test_dynamodbstreams/test_dynamodbstreams.py b/tests/test_dynamodbstreams/test_dynamodbstreams.py
index 7e4025626..b60c21053 100644
--- a/tests/test_dynamodbstreams/test_dynamodbstreams.py
+++ b/tests/test_dynamodbstreams/test_dynamodbstreams.py
@@ -180,7 +180,7 @@ class TestEdges():
         assert 'LatestStreamLabel' in resp['TableDescription']
 
         # now try to enable it again
-        with assert_raises(ValueError):
+        with assert_raises(conn.exceptions.ResourceInUseException):
             resp = conn.update_table(
                 TableName='test-streams',
                 StreamSpecification={