From 3380e105f6e51fc8095d8216783a75ea54126764 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 23 Oct 2015 09:21:29 -0400
Subject: [PATCH] Test: Merged default.command.t into default.t

---
 test/default.command.t | 62 ------------------------------------------
 test/default.t         | 20 ++++++++++++++
 2 files changed, 20 insertions(+), 62 deletions(-)
 delete mode 100755 test/default.command.t

diff --git a/test/default.command.t b/test/default.command.t
deleted file mode 100755
index 93944b127..000000000
--- a/test/default.command.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
-
-
-class TestCMD(TestCase):
-    @classmethod
-    def setUpClass(cls):
-        cls.t = Task()
-        cls.t.config("default.command", "list")
-
-        cls.t('add one')
-        cls.t('add two')
-
-    def test_default_command(self):
-        """default command"""
-        code, out, err = self.t()
-        self.assertIn("task list]", err)
-
-    def test_info_command(self):
-        """info command"""
-        code, out, err = self.t('1')
-        self.assertRegexpMatches(out, 'Description\s+one')
-
-
-if __name__ == "__main__":
-    from simpletap import TAPTestRunner
-    unittest.main(testRunner=TAPTestRunner())
-
-# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/default.t b/test/default.t
index ac4e74707..0d27fdfb3 100755
--- a/test/default.t
+++ b/test/default.t
@@ -35,6 +35,26 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 from basetest import Task, TestCase
 
 
+class TestCMD(TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.t = Task()
+        cls.t.config("default.command", "list")
+
+        cls.t('add one')
+        cls.t('add two')
+
+    def test_default_command(self):
+        """default command"""
+        code, out, err = self.t()
+        self.assertIn("task list]", err)
+
+    def test_info_command(self):
+        """info command"""
+        code, out, err = self.t('1')
+        self.assertRegexpMatches(out, 'Description\s+one')
+
+
 class TestDefaults(TestCase):
     @classmethod
     def setUpClass(cls):