tests: Modernize tw-1452 and tw-1481 tests

This commit is contained in:
Tomas Babej 2015-09-05 16:40:05 +02:00 committed by Paul Beckingham
parent 21617bf55e
commit ae1405a7be
2 changed files with 25 additions and 25 deletions

View file

@ -39,30 +39,30 @@ from basetest import Task, TestCase
class Test1452(TestCase):
def setUp(self):
self.t = Task()
self.t(('add', 'task'))
self.task_uuid = json.loads(self.t(('1', 'export'))[1].strip())['uuid']
self.t('add task')
self.task_uuid = self.t.export_one()['uuid']
def test_get_task_by_uuid_with_prefix(self):
"""Tries to filter task simply by it's uuid, using uuid: prefix."""
# Load task
output = self.t(('uuid:%s' % self.task_uuid, 'export'))[1]
output = self.t.export_one('uuid:%s' % self.task_uuid)
# Sanity check it is the correct one
self.assertEqual(json.loads(output.strip())['uuid'], self.task_uuid)
self.assertEqual(output['uuid'], self.task_uuid)
def test_get_task_by_uuid_without_prefix(self):
"""Tries to filter task simply by it's uuid, without using uuid: prefix."""
# Load task
output = self.t((self.task_uuid, 'export'))[1]
output = self.t.export_one(self.task_uuid)
# Sanity check it is the correct one
self.assertEqual(json.loads(output.strip())['uuid'], self.task_uuid)
self.assertEqual(output['uuid'], self.task_uuid)
if __name__ == "__main__":
from simpletap import TAPTestRunner
unittest.main(testRunner=TAPTestRunner())
# vim: ai sts=4 et sw=4
# vim: ai sts=4 et sw=4 ft=python

View file

@ -40,21 +40,21 @@ from basetest import Task, TestCase
class Test1481(TestCase):
def setUp(self):
self.t = Task()
self.t(('add', 'parent'))
self.t(('add', 'child'))
self.t(('add', 'child2'))
self.child1_uuid = json.loads(self.t(('2', 'export'))[1].strip(','))['uuid']
self.child2_uuid = json.loads(self.t(('3', 'export'))[1].strip(','))['uuid']
self.t('add parent')
self.t('add child')
self.t('add child2')
self.child1_uuid = self.t.export_one(2)['uuid']
self.child2_uuid = self.t.export_one(3)['uuid']
def test_set_dependency_on_first_completed_task(self):
"""Sets dependency on task which has been just completed."""
self.t(('2', 'done'))
self.t('2 done')
# Trigger the GC to clear up IDs
self.t(('next', ))
self.t('next')
# Set the dependency
self.t(('1', 'modify', 'depends:%s' % self.child1_uuid))
self.t('1 modify depends:%s' % self.child1_uuid)
def test_set_dependency_on_second_completed_task(self):
"""
@ -62,29 +62,29 @@ class Test1481(TestCase):
before most recently completed task.
"""
self.t(('2', 'done'))
self.t(('3', 'done'))
self.t('2 done')
self.t('3 done')
# Trigger the GC to clear up IDs
self.t(('next', ))
self.t('next')
# Set the dependencies
self.t(('1', 'modify', 'depends:%s' % self.child2_uuid))
self.t('1 modify depends:%s' % self.child2_uuid)
def test_set_dependency_on_two_completed_tasks(self):
""" Sets dependency on two most recent completed tasks. """
self.t(('2', 'done'))
self.t(('3', 'done'))
self.t('2 done')
self.t('3 done')
# Trigger the GC to clear up IDs
self.t(('next', ))
self.t('next')
# Set the dependencies
self.t(('1', 'modify', 'depends:%s,%s' % (self.child1_uuid,
self.child2_uuid)))
self.t('1 modify depends:%s,%s' % (self.child1_uuid,
self.child2_uuid))
if __name__ == "__main__":
from simpletap import TAPTestRunner
unittest.main(testRunner=TAPTestRunner())
# vim: ai sts=4 et sw=4
# vim: ai sts=4 et sw=4 ft=python