From a532855a48c9a7dbde475f425c232206c36125f4 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Thu, 23 Jul 2015 16:49:41 -0400 Subject: [PATCH] Test: Converted to Python --- test/bug.956.t | 133 ++++++++++++++++++++++++------------------------- 1 file changed, 65 insertions(+), 68 deletions(-) diff --git a/test/bug.956.t b/test/bug.956.t index 0b8362da0..447a2a627 100755 --- a/test/bug.956.t +++ b/test/bug.956.t @@ -1,80 +1,77 @@ -#! /usr/bin/env perl -################################################################################ -## -## 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 -## -################################################################################ +#!/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 +# +############################################################################### -use strict; -use warnings; -use Test::More tests => 12; +import sys +import os +import unittest +# Ensure python finds the local simpletap module +sys.path.append(os.path.dirname(os.path.abspath(__file__))) -# Ensure environment has no influence. -delete $ENV{'TASKDATA'}; -delete $ENV{'TASKRC'}; +from basetest import Task, TestCase -use File::Basename; -my $ut = basename ($0); -my $rc = $ut . '.rc'; -# Create the rc file. -if (open my $fh, '>', $rc) -{ - print $fh "data.location=.\n"; - close $fh; -} +class TestBug956(TestCase): + @classmethod + def setUpClass(cls): + """Executed once before any test in the class""" + cls.t = Task() + cls.t("add test") -# Bug 956 - 'task ids' prints the header, which prevents using the command in -# external script (it applies also for 'uuids' and helper subcommands). + def setUp(self): + """Executed before each test in the class""" -qx{../src/task rc:$rc add test 2>&1}; + def test_ids_header(self): + """Verify 'ids' does not print a header""" + code, out, err = self.t("rc.verbose:nothing ids") + self.assertIn("1\n", out) + self.assertNotIn("TASKRC", out) -# Solution 1: rc.verbose=nothing -my $output = qx{TASKRC=$rc ../src/task rc:$rc rc.verbose=nothing ids 2>&1}; -like ($output, qr/^1$/m, "$ut: ID 1 shown"); -unlike ($output, qr/TASKRC/ms, "$ut: The header does not appear with 'ids' (rc.verbose=nothing)"); + def test_ids_helper_header(self): + """Verify '_ids' does not print a header""" + code, out, err = self.t("rc.verbose:nothing _ids") + self.assertIn("1\n", out) + self.assertNotIn("TASKRC", out) -$output = qx{TASKRC=$rc ../src/task rc.verbose=nothing uuids 2>&1}; -like ($output, qr/^[0-9a-f-]*$/m, "$ut: UUID shown"); -unlike ($output, qr/TASKRC/ms, "$ut: The header does not appear with 'uuids' (rc.verbose=nothing)"); + def test_uuids_header(self): + """Verify 'uuids' does not print a header""" + code, out, err = self.t("rc.verbose:nothing uuids") + self.assertRegexpMatches(out, "[0-9a-f-]*\n") + self.assertNotIn("TASKRC", out) -$output = qx{TASKRC=$rc ../src/task rc.verbose=nothing uuids 2>&1}; -like ($output, qr/^[0-9a-f-]*$/m, "$ut: UUID shown"); -unlike ($output, qr/TASKRC/ms, "$ut: The header does not appear with 'uuids' (rc.verbose=nothing)"); + def test_uuids_helper_header(self): + """Verify '_uuids' does not print a header""" + code, out, err = self.t("rc.verbose:nothing _uuids") + self.assertRegexpMatches(out, "[0-9a-f-]*\n") + self.assertNotIn("TASKRC", out) -# Solution 2: task ... 2>/dev/null -$output = qx{TASKRC=$rc ../src/task rc:$rc ids 2>/dev/null}; -like ($output, qr/^1$/m, "$ut: ID 1 shown"); -unlike ($output, qr/TASKRC/ms, "$ut: The header does not appear with 'ids' (2>/dev/null)"); -$output = qx{TASKRC=$rc ../src/task _ids 2>/dev/null}; -like ($output, qr/^[0-9a-f-]*$/m, "$ut: UUID shown"); -unlike ($output, qr/TASKRC/ms, "$ut: The header does not appear with '_ids' (2>/dev/null)"); +if __name__ == "__main__": + from simpletap import TAPTestRunner + unittest.main(testRunner=TAPTestRunner()) -$output = qx{TASKRC=$rc ../src/task _ids 2>/dev/null}; -like ($output, qr/^[0-9a-f-]*$/m, "$ut: UUID shown"); -unlike ($output, qr/TASKRC/ms, "$ut: The header does not appear with '_ids' (2>/dev/null)"); - -# Cleanup. -unlink qw(pending.data completed.data undo.data backlog.data), $rc; -exit 0; +# vim: ai sts=4 et sw=4