openstack
/
fuel-ostf
Code Issues Proposed changes

Functional and unit tests for test_controller have been fixed

This commit is contained in:
Artem Roma 2013-10-02 16:41:40 +03:00
parent bd633e077a
commit c2918eefa9
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fuel_plugin/tests/functional/tests.py
View File

@ -59,19 +59,9 @@ class AdapterTests(BaseAdapterTest):
self.client.start_testrun(testset, cluster_id)
r = getattr(self.adapter, 'tests')().json()
r = self.adapter.tests().json()
with mock.patch(
'fuel_plugin.ostf_adapter.storage.engine.conf.dbpath',
new='postgresql+psycopg2://ostf:ostf@localhost/ostf',
create=True
):
with engine.get_session().begin(subtransactions=True):
tests = engine.get_session().query(models.Test)\
.filter_by(test_run_id=None)\
.all()
self.assertEqual(len(r), len(tests))
self.assertEqual(len(r), len(self.mapping))
def test_list_testsets(self):
"""Verify that self.testsets are in json response

2
fuel_plugin/tests/unit/test_wsgi_controllers.py
View File

@ -28,7 +28,7 @@ class TestTestsController(unittest2.TestCase):
self.controller = controllers.TestsController()
def test_get_all(self, request):
request.session.query().all.return_value = self.fixtures
request.session.query().filter_by().all.return_value = self.fixtures
res = self.controller.get_all()
self.assertEqual(res, [f.frontend for f in self.fixtures])