From 59edb6ca8735b03713703a2971590b63ba30414b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 23 Oct 2015 08:40:26 -0400
Subject: [PATCH] Test: Merged bug.956.t into helpers.t

---
 test/bug.956.t | 77 --------------------------------------------------
 test/helpers.t | 35 +++++++++++++++++++++++
 2 files changed, 35 insertions(+), 77 deletions(-)
 delete mode 100755 test/bug.956.t

diff --git a/test/bug.956.t b/test/bug.956.t
deleted file mode 100755
index 52a181b02..000000000
--- a/test/bug.956.t
+++ /dev/null
@@ -1,77 +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
-
-
-class TestBug956(TestCase):
-    @classmethod
-    def setUpClass(cls):
-        """Executed once before any test in the class"""
-        cls.t = Task()
-        cls.t("add test")
-
-    def setUp(self):
-        """Executed before each test in the class"""
-
-    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)
-
-    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)
-
-    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)
-
-    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)
-
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/helpers.t b/test/helpers.t
index 4ea011a33..ad2893831 100755
--- a/test/helpers.t
+++ b/test/helpers.t
@@ -49,6 +49,41 @@ class TestZshAttributes(TestCase):
              self.assertEqual(fields[0], fields[1])
 
 
+class TestBug956(TestCase):
+    @classmethod
+    def setUpClass(cls):
+        """Executed once before any test in the class"""
+        cls.t = Task()
+        cls.t("add test")
+
+    def setUp(self):
+        """Executed before each test in the class"""
+
+    def test_ids_header(self):
+        """956: 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)
+
+    def test_ids_helper_header(self):
+        """956: 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)
+
+    def test_uuids_header(self):
+        """956: 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)
+
+    def test_uuids_helper_header(self):
+        """956: 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)
+
+
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())