diff --git a/test/bug.986.t b/test/bug.986.t deleted file mode 100755 index 7d7e22538..000000000 --- a/test/bug.986.t +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env python2.7 -# -*- coding: utf-8 -*- -############################################################################### -# -# Copyright 2006 - 2015, Paul Beckingham, Federico Hernandez. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# -# http://www.opensource.org/licenses/mit-license.php -# -############################################################################### - -import sys -import os -import unittest -# Ensure python finds the local simpletap module -sys.path.append(os.path.dirname(os.path.abspath(__file__))) - -from basetest import Task, TestCase -from basetest import Taskd, ServerTestCase - - -class TestBug986(TestCase): - - def setUp(self): - """Executed before each test in the class""" - self.t = Task() - - def test_dateformat_precedence(self): - """Verify rc.dateformat.info takes precedence over rc.dateformat""" - self.t('add test') - self.t('1 start') - - code, out, err = self.t('1 info rc.dateformat:XX rc.dateformat.info:__') - self.assertIn('__', out) - self.assertNotIn('XX', out) - - code, out, err = self.t('1 info rc.dateformat:__ rc.dateformat.info:') - self.assertIn('__', out) - - -if __name__ == "__main__": - from simpletap import TAPTestRunner - unittest.main(testRunner=TAPTestRunner()) - -# vim: ai sts=4 et sw=4 ft=python diff --git a/test/dateformat.t b/test/dateformat.t index d59ab0708..3f8b5464c 100755 --- a/test/dateformat.t +++ b/test/dateformat.t @@ -57,7 +57,6 @@ class TestDateformat(TestCase): self.assertEqual(out.count("20150704T000000"), 3) class TestBug886(TestCase): - def setUp(self): """Executed before each test in the class""" self.t = Task() @@ -74,6 +73,24 @@ class TestBug886(TestCase): self.assertIn("'donkey' is not a valid date", err) +class TestBug986(TestCase): + def setUp(self): + """Executed before each test in the class""" + self.t = Task() + + def test_dateformat_precedence(self): + """986: Verify rc.dateformat.info takes precedence over rc.dateformat""" + self.t('add test') + self.t('1 start') + + code, out, err = self.t('1 info rc.dateformat:XX rc.dateformat.info:__') + self.assertIn('__', out) + self.assertNotIn('XX', out) + + code, out, err = self.t('1 info rc.dateformat:__ rc.dateformat.info:') + self.assertIn('__', out) + + if __name__ == "__main__": from simpletap import TAPTestRunner unittest.main(testRunner=TAPTestRunner())