Skip to content
This repository has been archived by the owner on Mar 24, 2021. It is now read-only.

Commit

Permalink
PEP-8
Browse files Browse the repository at this point in the history
  • Loading branch information
robyoung committed May 18, 2014
1 parent e6992f9 commit 29bd97e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 9 deletions.
3 changes: 1 addition & 2 deletions features/steps/api_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ def ensure_data_set_exists(context, data_set_name, settings={}):
response['data_group'], response['data_type'])): [response],
}

create_or_update_stagecraft_service(
context, TEST_STAGECRAFT_PORT, routes)
create_or_update_stagecraft_service(context, TEST_STAGECRAFT_PORT, routes)

context.data_set = data_set_name
2 changes: 1 addition & 1 deletion features/steps/read_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from behave import given, when, then, step_matcher
from flask import json
from hamcrest import assert_that, is_, matches_regexp, has_length, equal_to, \
has_item, has_entries, has_entry
has_item, has_entries, has_entry
from dateutil import parser
import datetime
import pytz
Expand Down
9 changes: 5 additions & 4 deletions features/support/authentication.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
from stagecraft import create_or_update_stagecraft_service


TEST_STAGECRAFT_PORT = 3204


def _get_user_routes(email, data):
return {
('GET', u'users/{}'.format(email)): data,
('GET', u'users'): [data],
}


def ensure_user_has_permissions(context, email, data_sets):
user_data = {
"email": email,
Expand All @@ -16,8 +19,7 @@ def ensure_user_has_permissions(context, email, data_sets):

routes = _get_user_routes(email, user_data)

create_or_update_stagecraft_service(
context, TEST_STAGECRAFT_PORT, routes)
create_or_update_stagecraft_service(context, TEST_STAGECRAFT_PORT, routes)


def ensure_user_exists(context, email):
Expand All @@ -28,5 +30,4 @@ def ensure_user_exists(context, email):

routes = _get_user_routes(email, user_data)

create_or_update_stagecraft_service(
context, TEST_STAGECRAFT_PORT, routes)
create_or_update_stagecraft_service(context, TEST_STAGECRAFT_PORT, routes)
8 changes: 6 additions & 2 deletions features/support/tests/test_stagecraft.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
from nose.tools import assert_raises
from hamcrest import assert_that, is_

from ..stagecraft import StagecraftService, create_or_update_stagecraft_service, stop_stagecraft_service_if_running
from ..stagecraft import StagecraftService, \
create_or_update_stagecraft_service, stop_stagecraft_service_if_running


class StubContext(object):
Expand All @@ -22,6 +23,7 @@ def __setattr__(self, key, value):
def __contains__(self, key):
return key in self._params


def test_create_stagecraft_service():
context = StubContext()
service = create_or_update_stagecraft_service(context, 2012, {})
Expand All @@ -40,7 +42,8 @@ def test_update_stagecraft_service():
response = requests.get('http://localhost:8089/example')
assert_that(response.status_code, is_(404))

service2 = create_or_update_stagecraft_service(context, 8089,
service2 = create_or_update_stagecraft_service(
context, 8089,
{('GET', u'example'): {u'foo': u'bar'}})
response = requests.get('http://localhost:8089/example')
assert_that(response.status_code, is_(200))
Expand All @@ -59,6 +62,7 @@ def test_stop_stagecraft_if_running():

assert_that(service.running(), is_(False))


class TestStagecraftService(object):
def create_service(self):
return StagecraftService(8089, {
Expand Down

0 comments on commit 29bd97e

Please sign in to comment.