Skip to content

Commit

Permalink
More readme fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ineentho committed Apr 24, 2015
1 parent b58fb7c commit b2322c1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
10 changes: 4 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Opidio hub server
# Opidio Hub Server
[![Build Status](https://img.shields.io/circleci/project/opidio/hub-server.svg?style=flat-square)](https://circleci.com/gh/opidio/hub-server)
[![Code Coverage](https://img.shields.io/coveralls/opidio/hub-server.svg?style=flat-square)](https://coveralls.io/r/opidio/hub-server)

Expand All @@ -8,12 +8,10 @@ The Opidio Projects:
[![Channel Server](https://img.shields.io/badge/opidio-channel--server-lightgray.svg?style=flat-square)](https://github.com/opidio/channel-server)
[![Android Client](https://img.shields.io/badge/opidio-android--client-lightgray.svg?style=flat-square)](https://github.com/opidio/android-client)

The hub serveraggregates multiple channel servers and provides an API for clients
The hub server aggregates multiple channel servers and provides an API for clients
(such as the Android client) to list all channels from one place. The hub server
is also the one responsible for handling user data.

Opidio hub server

## A note on docker

Using docker is completely optional, using a virtualenv should
Expand All @@ -26,8 +24,8 @@ to start the server or tests.

### Starting the server

sudo docker-compose up
docker-compose up

### Running the tests

sudo docker-compose run main ./runtests
docker-compose run main ./runtests
7 changes: 3 additions & 4 deletions tests/test_channel_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,15 @@ def test_register_password(self):
self.assertIn(b'password is required', rv.data)
self.assertEqual(rv.status_code, 400)

"""
def test_valid_parameters(self):
""
"""
Test if a channel is created when supplied valid parameters
""
"""
rv = self.post_json('/channel/register', {
'name': 'test-channel',
'slug': 'test-channel',
'url': 'http://test-channel-servrer.opid.io/test-channel',
'password': 'test123'
})
self.assertIn(b'Channel created', rv.data)
self.assertEqual(rv.status_code, 200)"""
self.assertEqual(rv.status_code, 200)

0 comments on commit b2322c1

Please sign in to comment.