From 56fbdb98b013b2e98fc7ed2c4d5ea4905d64e4f6 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 12 Jun 2009 03:45:53 +0200
Subject: Move subunitrun => subunit.run

---
 python/subunit/__init__.py | 11 -----------
 python/subunit/run.py      | 45 +++++++++++++++++++++++++++++++++++++++++++++
 python/subunitrun          | 32 --------------------------------
 3 files changed, 45 insertions(+), 43 deletions(-)
 create mode 100755 python/subunit/run.py
 delete mode 100755 python/subunitrun

(limited to 'python')

diff --git a/python/subunit/__init__.py b/python/subunit/__init__.py
index 23f3f07..7d800a8 100644
--- a/python/subunit/__init__.py
+++ b/python/subunit/__init__.py
@@ -774,14 +774,3 @@ class TestResultFilter(unittest.TestResult):
             return id[len("subunit.RemotedTestCase."):]
         return id
 
-
-class SubunitTestRunner(object):
-    def __init__(self, stream=sys.stdout):
-        self.stream = stream
-
-    def run(self, test):
-        "Run the given test case or test suite."
-        result = TestProtocolClient(self.stream)
-        test(result)
-        return result
-
diff --git a/python/subunit/run.py b/python/subunit/run.py
new file mode 100755
index 0000000..de15611
--- /dev/null
+++ b/python/subunit/run.py
@@ -0,0 +1,45 @@
+#!/usr/bin/python
+
+# Simple subunit testrunner for python
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007
+#   
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#   
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#   
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import sys
+
+from subunit import TestProtocolClient
+
+
+class SubunitTestRunner(object):
+    def __init__(self, stream=sys.stdout):
+        self.stream = stream
+
+    def run(self, test):
+        "Run the given test case or test suite."
+        result = TestProtocolClient(self.stream)
+        test(result)
+        return result
+
+
+if __name__ == '__main__':
+    import optparse
+    from unittest import TestProgram
+    parser = optparse.OptionParser("subunitrun <tests>")
+
+    args = parser.parse_args()[1]
+
+    runner = SubunitTestRunner()
+    program = TestProgram(module=None, argv=[sys.argv[0]] + args, 
+                          testRunner=runner)
diff --git a/python/subunitrun b/python/subunitrun
deleted file mode 100755
index a1ec1d9..0000000
--- a/python/subunitrun
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/python
-
-# Simple subunit testrunner for python
-# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007
-#   
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#   
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#   
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-import sys
-
-from subunit import SubunitTestRunner
-from unittest import TestProgram
-import optparse
-import os
-
-parser = optparse.OptionParser("subunitrun <tests>")
-
-args = parser.parse_args()[1]
-
-runner = SubunitTestRunner()
-program = TestProgram(module=None, argv=[sys.argv[0]] + args, testRunner=runner)
-- 
cgit v1.2.1