Dark-Alex-17/kapow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixes to steps and compliant poc control API

Browse Source
This commit is contained in:
Roberto Abdelkader Martínez Pérez
2019-08-22 09:27:53 +02:00
parent 93a89acbce
commit 80dc654115
9 changed files with 68 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
poc/bin/kapow
+18 -6
View File
@@ -274,7 +274,14 @@ def handle_route(entrypoint, command):
def get_routes(app):
async def _get_routes(request):
"""Return the list of registered routes."""
return web.json_response(list(app.router))
data = [{"index": idx,
"method": r.method,
"id": r.id,
"url_pattern": r.path,
"entrypoint": r.entrypoint,
"command": r.command}
for idx, r in enumerate(app["user_routes"])]
return web.json_response(data)
return _get_routes
@@ -340,7 +347,8 @@ def append_route(app):
"url_pattern": route.path,
"entrypoint": route.entrypoint,
"command": route.command,
"index": len(app["user_routes"])-1}, status=201)
"index": len(app["user_routes"])-1},
status=201)
return _append_route
@@ -348,10 +356,14 @@ def delete_route(app):
async def _delete_route(request):
"""Delete the given Kapow! route."""
id = request.match_info["id"]
route = app.router._named_resources.pop(id)
app.router._resources.remove(route)
print(f'Route deleted {id}')
return web.json_response(id)
routes = [r for r in app["user_routes"] if r.id != id]
if len(routes) == len(app["user_routes"]):
return web.Response(status=404, reason="Not Found")
else:
app.change_routes(routes)
app["user_routes"] = routes
print(f'Route deleted {id}')
return web.Response(status=200, reason="OK")
return _delete_route
spec/test/features/control/delete/list_order.feature
+2 -2
View File
@@ -45,7 +45,7 @@ Feature: Routes auto-ordering after deleting in a Kapow! server.
},
{
"method": "GET",
"url_pattern": "/listDir/:dirname",
"url_pattern": "/listDir/{dirname}",
"entrypoint": "/bin/sh -c",
"command": "ls -la /request/params/dirname | response /body",
"index": 2,
@@ -128,7 +128,7 @@ Feature: Routes auto-ordering after deleting in a Kapow! server.
},
{
"method": "GET",
"url_pattern": "/listDir/:dirname",
"url_pattern": "/listDir/{dirname}",
"entrypoint": "/bin/sh -c",
"command": "ls -la /request/params/dirname | response /body",
"index": 2,
spec/test/features/control/insert/error_malformed.feature
+1 -1
View File
@@ -20,6 +20,6 @@ Feature: Kapow! server reject insert requests with malformed JSON bodies.
"id": "xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx"
}
"""
Then I get bad request as response code
Then I get 400 as response code
And I get "Malformed JSON" as response reason phrase
And I get an empty response body
spec/test/features/control/insert/error_unprocessable.feature
+2 -31
View File
@@ -16,16 +16,7 @@ Feature: Kapow! server reject insert responses with semantic errors.
}
"""
Then I get 422 as response code
And I get "Missing Mandatory Field" as response reason phrase
And I get the following response body:
"""
{
"missing_mandatory_fields": [
"url_pattern",
"method"
]
}
"""
And I get "Invalid Route" as response reason phrase
Scenario: Error because of wrong route specification.
If a request contains an invalid expression in the
@@ -43,24 +34,4 @@ Feature: Kapow! server reject insert responses with semantic errors.
}
"""
Then I get 422 as response code
And I get "Invalid Route Spec" as response reason phrase
And I get an empty response body
Scenario: Error because of wrong method value.
If a request contains an invalid value in the
method field the server responds with an error.
Given I have a running Kapow! server
When I insert the route:
"""
{
"method": "SOMETIMES",
"url_pattern": "/",
"entrypoint": "/bin/sh -c",
"command": "ls -la / | response /body",
"index": 0
}
"""
Then I get 422 as response code
And I get "Invalid Data Type" as response reason phrase
And I get an empty response body
And I get "Invalid Route" as response reason phrase
spec/test/features/control/insert/list_order.feature
+9 -9
View File
@@ -24,8 +24,8 @@ Feature: Routes auto-ordering after inserting in a Kapow! server.
"index": 0
}
"""
Then I get 200 as response code
And I get "OK" as response reason phrase
Then I get 201 as response code
And I get "Created" as response reason phrase
And I get the following response body:
"""
{
@@ -61,7 +61,7 @@ Feature: Routes auto-ordering after inserting in a Kapow! server.
},
{
"method": "GET",
"url_pattern": "/listDir/:dirname",
"url_pattern": "/listDir/{dirname}",
"entrypoint": "/bin/sh -c",
"command": "ls -la /request/params/dirname | response /body",
"index": 2,
@@ -84,8 +84,8 @@ Feature: Routes auto-ordering after inserting in a Kapow! server.
"index": 2
}
"""
Then I get 200 as response code
And I get "OK" as response reason phrase
Then I get 201 as response code
And I get "Created" as response reason phrase
And I get the following response body:
"""
{
@@ -113,7 +113,7 @@ Feature: Routes auto-ordering after inserting in a Kapow! server.
},
{
"method": "GET",
"url_pattern": "/listDir/:dirname",
"url_pattern": "/listDir/{dirname}",
"entrypoint": "/bin/sh -c",
"command": "ls -la /request/params/dirname | response /body",
"index": 1,
@@ -145,8 +145,8 @@ Feature: Routes auto-ordering after inserting in a Kapow! server.
"index": 1
}
"""
Then I get 200 as response code
And I get "OK" as response reason phrase
Then I get 201 as response code
And I get "Created" as response reason phrase
And I get the following response body:
"""
{
@@ -182,7 +182,7 @@ Feature: Routes auto-ordering after inserting in a Kapow! server.
},
{
"method": "GET",
"url_pattern": "/listDir/:dirname",
"url_pattern": "/listDir/{dirname}",
"entrypoint": "/bin/sh -c",
"command": "ls -la /request/params/dirname | response /body",
"index": 2,
spec/test/features/control/insert/success.feature
+4 -4
View File
@@ -23,8 +23,8 @@ Feature: Insert new routes in Kapow! server.
"index": 0
}
"""
Then I get 200 as response code
And I get "OK" as response reason phrase
Then I get 201 as response code
And I get "Created" as response reason phrase
And I get the following response body:
"""
{
@@ -52,8 +52,8 @@ Feature: Insert new routes in Kapow! server.
"index": 1
}
"""
Then I get 200 as response code
And I get "OK" as response reason phrase
Then I get 201 as response code
And I get "Created" as response reason phrase
And I get the following response body:
"""
{
spec/test/features/control/list/success.feature
+1 -1
View File
@@ -37,7 +37,7 @@ Feature: Listing routes in a Kapow! server
},
{
"method": "GET",
"url_pattern": "/listDir/:dirname",
"url_pattern": "/listDir/{dirname}",
"entrypoint": "/bin/sh -c",
"command": "ls -la /request/params/dirname | response /body",
"index": 1,
spec/test/features/steps/comparedict.py
+4 -10
View File
@@ -31,16 +31,10 @@ def _(model, obj):
@is_subset.register(list)
@assert_same_type
def _(model, obj):
if is_subset(set(model), set(obj)):
return True
else:
raise ValueError(f"Non-matching lists {model!r} != {obj!r}")
@is_subset.register(set)
@assert_same_type
def _(model, obj):
return model <= obj
for a, b in zip(model, obj):
if not is_subset(a, b):
raise ValueError(f"Non-matching list member {a!r} in {b!r}")
return True
@is_subset.register(ANY)
spec/test/features/steps/steps.py
+27 -29
View File
@@ -103,18 +103,8 @@ def step_impl(context):
def step_impl(context):
context.response.raise_for_status()
if not hasattr(context, 'table'):
raise RuntimeError("A table must be set for this step.")
assert is_subset(jsonexample.loads(context.text), context.response.json())
for entry, row in zip(context.response.json(), context.table):
for header in row.headings:
assert header in entry, f"Response does not contain the key {header}"
if row[header] != '*':
assert entry[header] == row[header], f"Values mismatch"
#
#
#
@when('I append the route')
def step_impl(context):
@@ -145,7 +135,7 @@ def step_impl(context):
@when('I delete the route with id "{id}"')
def step_impl(context, id):
raise NotImplementedError('STEP: When I delete the route with id "xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx"')
context.response = requests.delete(f"{Env.KAPOW_CONTROLAPI_URL}/routes/{id}")
@given('It has a route with id "{id}"')
@@ -155,12 +145,9 @@ def step_impl(context, id):
@when('I insert the route')
def step_impl(context):
if not hasattr(context, 'table'):
raise RuntimeError("A table must be set for this step.")
row = context.table[0]
context.response = requests.put(f"{Env.KAPOW_CONTROLAPI_URL}/routes",
json={h: row[h] for h in row.headings})
headers={"Content-Type": "application/json"},
data=context.text)
@when('I try to append with this malformed JSON document')
@@ -172,21 +159,32 @@ def step_impl(context):
data=context.text)
@when('I delete the first route inserted')
def step_impl(context):
raise NotImplementedError('STEP: When I delete the first route inserted')
# @when('I delete the first route')
# @when('I delete the first route inserted')
# def step_impl(context):
# routes = requests.get(f"{Env.KAPOW_CONTROLAPI_URL}/routes")
# id = routes.json()[0]["id"]
# context.response = requests.delete(f"{Env.KAPOW_CONTROLAPI_URL}/routes/{id}")
# @when('I delete the last route inserted')
# def step_impl(context):
# routes = requests.get(f"{Env.KAPOW_CONTROLAPI_URL}/routes")
# id = routes.json()[-1]["id"]
# context.response = requests.delete(f"{Env.KAPOW_CONTROLAPI_URL}/routes/{id}")
@when('I delete the last route inserted')
def step_impl(context):
raise NotImplementedError('STEP: When I delete the last route inserted')
@when('I delete the second route inserted')
def step_impl(context):
raise NotImplementedError('STEP: When I delete the second route inserted')
@when('I delete the {order} route')
@when('I delete the {order} route inserted')
def step_impl(context, order):
idx = {"first": 0, "second": 1, "last": -1}.get(order)
routes = requests.get(f"{Env.KAPOW_CONTROLAPI_URL}/routes")
id = routes.json()[idx]["id"]
context.response = requests.delete(f"{Env.KAPOW_CONTROLAPI_URL}/routes/{id}")
@when('I try to insert with this JSON document')
def step_impl(context):
raise NotImplementedError('STEP: When I try to insert with this JSON document')
context.response = requests.put(
f"{Env.KAPOW_CONTROLAPI_URL}/routes",
headers={"Content-Type": "application/json"},
data=context.text)