Skip to content

Commit

Permalink
Moved app under openaddr.ci module and tests under openaddr.tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@migurski
migurski committed May 6, 2015
1 parent a052088 commit 46a1237
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 2 deletions.
Empty file added openaddr/__init__.py
View file
Empty file.
0 app.py → openaddr/ci/__init__.py
View file
File renamed without changes.
Empty file added openaddr/tests/__init__.py
View file
Empty file.
4 changes: 2 additions & 2 deletions tests.py → openaddr/tests/ci.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
os.environ['GITHUB_TOKEN'] = ''
os.environ['DATABASE_URL'] = 'postgres:///hooked_on_sources'

from app import (
from ..ci import (
app, db_connect, db_cursor, db_queue, pop_finished_task_from_queue,
TASK_QUEUE, DONE_QUEUE, MAGIC_OK_MESSAGE
)
Expand Down Expand Up @@ -226,7 +226,7 @@ def test_webhook_two_branch_commits(self):
'''
data = '''{\r "ref": "refs/heads/branch",\r "before": "b659130053b85cd3993b1a4653da1bf6231ec0b4",\r "after": "e5f1dcae83ab1ef1f736b969da617311f7f11564",\r "created": false,\r "deleted": false,\r "forced": false,\r "base_ref": null,\r "compare": "https://github.com/openaddresses/hooked-on-sources/compare/b659130053b8...e5f1dcae83ab",\r "commits": [\r {\r "id": "0cbd51b8f6044e98c919dcabf93e3f4e1d58c035",\r "distinct": true,\r "message": "Added Polish source",\r "timestamp": "2015-04-25T17:52:39-07:00",\r "url": "https://github.com/openaddresses/hooked-on-sources/commit/0cbd51b8f6044e98c919dcabf93e3f4e1d58c035",\r "author": {\r "name": "Michal Migurski",\r "email": "[email protected]",\r "username": "migurski"\r },\r "committer": {\r "name": "Michal Migurski",\r "email": "[email protected]",\r "username": "migurski"\r },\r "added": [\r "sources/pl-dolnoslaskie.json"\r ],\r "removed": [\r\r ],\r "modified": [\r\r ]\r },\r {\r "id": "e5f1dcae83ab1ef1f736b969da617311f7f11564",\r "distinct": true,\r "message": "Removed Polish source",\r "timestamp": "2015-04-25T17:52:46-07:00",\r "url": "https://github.com/openaddresses/hooked-on-sources/commit/e5f1dcae83ab1ef1f736b969da617311f7f11564",\r "author": {\r "name": "Michal Migurski",\r "email": "[email protected]",\r "username": "migurski"\r },\r "committer": {\r "name": "Michal Migurski",\r "email": "[email protected]",\r "username": "migurski"\r },\r "added": [\r\r ],\r "removed": [\r "sources/pl-dolnoslaskie.json"\r ],\r "modified": [\r\r ]\r }\r ],\r "head_commit": {\r "id": "e5f1dcae83ab1ef1f736b969da617311f7f11564",\r "distinct": true,\r "message": "Removed Polish source",\r "timestamp": "2015-04-25T17:52:46-07:00",\r "url": "https://github.com/openaddresses/hooked-on-sources/commit/e5f1dcae83ab1ef1f736b969da617311f7f11564",\r "author": {\r "name": "Michal Migurski",\r "email": "[email protected]",\r "username": "migurski"\r },\r "committer": {\r "name": "Michal Migurski",\r "email": "[email protected]",\r "username": "migurski"\r },\r "added": [\r\r ],\r "removed": [\r "sources/pl-dolnoslaskie.json"\r ],\r "modified": [\r\r ]\r },\r "repository": {\r "id": 34590951,\r "name": "hooked-on-sources",\r "full_name": "openaddresses/hooked-on-sources",\r "owner": {\r "name": "openaddresses",\r "email": "[email protected]"\r },\r "private": false,\r "html_url": "https://github.com/openaddresses/hooked-on-sources",\r "description": "Temporary repository for testing Github webhook features",\r "fork": false,\r "url": "https://github.com/openaddresses/hooked-on-sources",\r "forks_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/forks",\r "keys_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/keys{/key_id}",\r "collaborators_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/collaborators{/collaborator}",\r "teams_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/teams",\r "hooks_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/hooks",\r "issue_events_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/issues/events{/number}",\r "events_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/events",\r "assignees_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/assignees{/user}",\r "branches_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/branches{/branch}",\r "tags_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/tags",\r "blobs_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/git/blobs{/sha}",\r "git_tags_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/git/tags{/sha}",\r "git_refs_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/git/refs{/sha}",\r "trees_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/git/trees{/sha}",\r "statuses_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/statuses/{sha}",\r "languages_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/languages",\r "stargazers_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/stargazers",\r "contributors_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/contributors",\r "subscribers_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/subscribers",\r "subscription_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/subscription",\r "commits_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/commits{/sha}",\r "git_commits_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/git/commits{/sha}",\r "comments_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/comments{/number}",\r "issue_comment_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/issues/comments{/number}",\r "contents_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/contents/{+path}",\r "compare_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/compare/{base}...{head}",\r "merges_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/merges",\r "archive_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/{archive_format}{/ref}",\r "downloads_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/downloads",\r "issues_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/issues{/number}",\r "pulls_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/pulls{/number}",\r "milestones_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/milestones{/number}",\r "notifications_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/notifications{?since,all,participating}",\r "labels_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/labels{/name}",\r "releases_url": "https://api.github.com/repos/openaddresses/hooked-on-sources/releases{/id}",\r "created_at": 1430006167,\r "updated_at": "2015-04-25T23:56:07Z",\r "pushed_at": 1430009572,\r "git_url": "git://github.com/openaddresses/hooked-on-sources.git",\r "ssh_url": "[email protected]:openaddresses/hooked-on-sources.git",\r "clone_url": "https://github.com/openaddresses/hooked-on-sources.git",\r "svn_url": "https://github.com/openaddresses/hooked-on-sources",\r "homepage": null,\r "size": 0,\r "stargazers_count": 0,\r "watchers_count": 0,\r "language": null,\r "has_issues": true,\r "has_downloads": true,\r "has_wiki": true,\r "has_pages": false,\r "forks_count": 0,\r "mirror_url": null,\r "open_issues_count": 1,\r "forks": 0,\r "open_issues": 1,\r "watchers": 0,\r "default_branch": "master",\r "stargazers": 0,\r "master_branch": "master",\r "organization": "openaddresses"\r },\r "pusher": {\r "name": "migurski",\r "email": "[email protected]"\r },\r "organization": {\r "login": "openaddresses",\r "id": 6895392,\r "url": "https://api.github.com/orgs/openaddresses",\r "repos_url": "https://api.github.com/orgs/openaddresses/repos",\r "events_url": "https://api.github.com/orgs/openaddresses/events",\r "members_url": "https://api.github.com/orgs/openaddresses/members{/member}",\r "public_members_url": "https://api.github.com/orgs/openaddresses/public_members{/member}",\r "avatar_url": "https://avatars.githubusercontent.com/u/6895392?v=3",\r "description": "The free and open global address collection "\r },\r "sender": {\r "login": "migurski",\r "id": 58730,\r "avatar_url": "https://avatars.githubusercontent.com/u/58730?v=3",\r "gravatar_id": "",\r "url": "https://api.github.com/users/migurski",\r "html_url": "https://github.com/migurski",\r "followers_url": "https://api.github.com/users/migurski/followers",\r "following_url": "https://api.github.com/users/migurski/following{/other_user}",\r "gists_url": "https://api.github.com/users/migurski/gists{/gist_id}",\r "starred_url": "https://api.github.com/users/migurski/starred{/owner}{/repo}",\r "subscriptions_url": "https://api.github.com/users/migurski/subscriptions",\r "organizations_url": "https://api.github.com/users/migurski/orgs",\r "repos_url": "https://api.github.com/users/migurski/repos",\r "events_url": "https://api.github.com/users/migurski/events{/privacy}",\r "received_events_url": "https://api.github.com/users/migurski/received_events",\r "type": "User",\r "site_admin": false\r }\r }'''

with patch('app.add_files_to_queue') as add_files_to_queue:
with patch('openaddr.ci.add_files_to_queue') as add_files_to_queue:
def job_queue_fails(*args, **kwargs):
raise Exception('Nope')

Expand Down
10 changes: 10 additions & 0 deletions test.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# coding=utf8
"""
Run Python test suite via the standard unittest mechanism.
"""
import unittest

from openaddr.tests.ci import TestHook

if __name__ == '__main__':
unittest.main()

0 comments on commit 46a1237

Please sign in to comment.