commit 489c7bab48001e8af82b897f2d7ab5a487169643 Author: Beck csybeck@gmail.com Date: Fri Jun 29 23:22:36 2012 +0800
Skipped some unrelevant integ test cases on windows --- test/integ/util/system.py | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/run_tests.py b/run_tests.py old mode 100644 new mode 100755 diff --git a/test/integ/util/system.py b/test/integ/util/system.py index a99e56c..8293120 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -76,6 +76,9 @@ class TestSystem(unittest.TestCase): Checks the stem.util.system.is_running function. """
+ if not stem.util.system.is_available("ps"): + test.runner.skip(self, "(ps unavailable)") + return self.assertTrue(stem.util.system.is_running("tor")) self.assertFalse(stem.util.system.is_running("blarg_and_stuff"))
@@ -85,6 +88,9 @@ class TestSystem(unittest.TestCase): will fail if there's other tor instances running. """
+ if stem.util.system.is_windows(): + test.runner.skip(self, "(unavailable on windows)") + return if self.is_extra_tor_running: test.runner.skip(self, "(multiple tor instances)") return @@ -197,7 +203,9 @@ class TestSystem(unittest.TestCase): """ Checks general usage of the stem.util.system.get_pid_by_port function. """ - + if stem.util.system.is_windows(): + test.runner.skip(self, "(unavailable on windows)") + return runner = test.runner.get_runner() if not _has_port(): test.runner.skip(self, "(test instance has no port)") @@ -225,7 +233,7 @@ class TestSystem(unittest.TestCase): elif not stem.util.system.is_available("netstat"): test.runner.skip(self, "(netstat unavailable)") return - elif stem.util.system.is_bsd(): + elif stem.util.system.is_bsd() or stem.util.system.is_windows(): test.runner.skip(self, "(linux only)") return elif not runner.is_ptraceable(): @@ -311,6 +319,9 @@ class TestSystem(unittest.TestCase):
runner = test.runner.get_runner()
+ if stem.util.system.is_windows(): + test.runner.skip(self, "(unavailable on windows)") + return if not runner.is_ptraceable(): test.runner.skip(self, "(DisableDebuggerAttachment is set)") return