diff --git a/.coveragerc b/.coveragerc index 3f0935be..41c49462 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,5 +1,6 @@ [run] source = atramhasis +omit = atramhasis/scripts/* [report] show_missing = True \ No newline at end of file diff --git a/atramhasis/tests.py b/atramhasis/tests.py index 5c89f091..8c026713 100644 --- a/atramhasis/tests.py +++ b/atramhasis/tests.py @@ -11,56 +11,22 @@ class TestMyViewSuccessCondition(unittest.TestCase): def setUp(self): self.config = testing.setUp() - from sqlalchemy import create_engine - engine = create_engine('sqlite://') - from .models import ( - Base, - MyModel, - ) - DBSession.configure(bind=engine) - Base.metadata.create_all(engine) - with transaction.manager: - model = MyModel(name='one', value=55) - DBSession.add(model) def tearDown(self): - DBSession.remove() testing.tearDown() def test_passing_view(self): from .views import my_view request = testing.DummyRequest() info = my_view(request) - self.assertEqual(info['one'].name, 'one') + print('info' + info['project']) self.assertEqual(info['project'], 'atramhasis') -class TestMyViewFailureCondition(unittest.TestCase): - def setUp(self): - self.config = testing.setUp() - from sqlalchemy import create_engine - engine = create_engine('sqlite://') - from .models import ( - Base, - MyModel, - ) - DBSession.configure(bind=engine) - - def tearDown(self): - DBSession.remove() - testing.tearDown() - - def test_failing_view(self): - from .views import my_view - request = testing.DummyRequest() - info = my_view(request) - self.assertEqual(info.status_int, 500) - - class TestScaffolding(unittest.TestCase): def test_scaffolding(self): - atemp= AtramhasisTemplate('test') - atempdemo= AtramhasisDemoTemplate('demo') + atemp = AtramhasisTemplate('test') + atempdemo = AtramhasisDemoTemplate('demo') self.assertEqual(atemp.summary, 'Create an Atramhasis implementation') self.assertEqual(atempdemo.summary, 'Create an Atramhasis demo') self.assertEqual(atemp.name, 'test') diff --git a/atramhasis/views.py b/atramhasis/views.py index 315a5658..0fd043fd 100644 --- a/atramhasis/views.py +++ b/atramhasis/views.py @@ -1,35 +1,8 @@ -from pyramid.response import Response from pyramid.view import view_config -from sqlalchemy.exc import DBAPIError - -from .models import ( - DBSession, - MyModel, - ) - @view_config(route_name='home', renderer='templates/atramhasis.jinja2') def my_view(request): - try: - one = DBSession.query(MyModel).filter(MyModel.name == 'one').first() - except DBAPIError: - return Response(conn_err_msg, content_type='text/plain', status_int=500) - return {'one': one, 'project': 'atramhasis'} - -conn_err_msg = """\ -Pyramid is having a problem using your SQL database. The problem -might be caused by one of the following things: - -1. You may need to run the "initialize_atramhasis_db" script - to initialize your database tables. Check your virtual - environment's "bin" directory for this script and try to run it. - -2. Your database server may not be running. Check that the - database server referred to by the "sqlalchemy.url" setting in - your "development.ini" file is running. - -After you fix the problem, please restart the Pyramid application to -try it again. -""" + test = 'test 1 2 3' + return {'test': test, 'project': 'atramhasis'}