From 909f48a371387075c0fc9a89ea55d706e1211346 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 23 Oct 2015 10:22:23 -0400
Subject: [PATCH] Test: Merged feature.608.t into start.t

---
 test/feature.608.t | 62 ----------------------------------------------
 test/start.t       | 19 ++++++++++++++
 2 files changed, 19 insertions(+), 62 deletions(-)
 delete mode 100755 test/feature.608.t

diff --git a/test/feature.608.t b/test/feature.608.t
deleted file mode 100755
index 6a800261b..000000000
--- a/test/feature.608.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 json
-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 TestFeature608(TestCase):
-    def setUp(self):
-        """Executed before each test in the class"""
-        self.t = Task()
-
-    def test_done_stop(self):
-        """Done should stop an active task"""
-        self.t("add foo")
-        self.t("1 start")
-        code, out, err = self.t("export")
-        self.assertIn('"start":', out)
-        self.assertNotIn('"end":', out)
-
-        self.t("1 done")
-        code, out, err = self.t("export")
-        self.assertNotIn('"start":', out)
-        self.assertIn('"end":', 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/start.t b/test/start.t
index 4a3fa13f7..b9540483c 100755
--- a/test/start.t
+++ b/test/start.t
@@ -127,6 +127,25 @@ class TestActiveTaskHandling(TestCase):
         self.assertIn("Task 1 'one' already started.", out)
 
 
+class TestFeature608(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+
+    def test_done_stop(self):
+        """608: Done should stop an active task"""
+        self.t("add foo")
+        self.t("1 start")
+        code, out, err = self.t("export")
+        self.assertIn('"start":', out)
+        self.assertNotIn('"end":', out)
+
+        self.t("1 done")
+        code, out, err = self.t("export")
+        self.assertNotIn('"start":', out)
+        self.assertIn('"end":', out)
+
+
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())