summaryrefslogtreecommitdiff
path: root/functional_tests
diff options
context:
space:
mode:
authorkumar <kumar.mcmillan@gmail.com>2011-11-04 14:23:19 -0500
committerkumar <kumar.mcmillan@gmail.com>2011-11-04 14:23:19 -0500
commitbf47a3e232c74ebee2b99bdbc44ea77e43ba7c3a (patch)
tree39438a246b1a6ca47eaddce4bf5bdae200a10ac5 /functional_tests
parent378f8dc82fea04ff2a5a7e6f45a0238981187daa (diff)
downloadnose-bf47a3e232c74ebee2b99bdbc44ea77e43ba7c3a.tar.gz
Fixes relative imports and path to support dir
Diffstat (limited to 'functional_tests')
-rw-r--r--functional_tests/test_multiprocessing/test_class.py4
-rw-r--r--functional_tests/test_multiprocessing/test_concurrent_shared.py5
-rw-r--r--functional_tests/test_multiprocessing/test_nameerror.py4
-rw-r--r--functional_tests/test_multiprocessing/test_process_timeout.py4
4 files changed, 9 insertions, 8 deletions
diff --git a/functional_tests/test_multiprocessing/test_class.py b/functional_tests/test_multiprocessing/test_class.py
index 6f42ac3..d92710d 100644
--- a/functional_tests/test_multiprocessing/test_class.py
+++ b/functional_tests/test_multiprocessing/test_class.py
@@ -1,11 +1,11 @@
import os
-from . import support, MPTestBase
+from test_multiprocessing import MPTestBase
#test case for #462
class TestClassFixture(MPTestBase):
- suitepath = os.path.join(support, 'class.py')
+ suitepath = os.path.join(os.path.dirname(__file__), 'support', 'class.py')
def runTest(self):
assert str(self.output).strip().endswith('OK')
diff --git a/functional_tests/test_multiprocessing/test_concurrent_shared.py b/functional_tests/test_multiprocessing/test_concurrent_shared.py
index 9974bfd..2552c2b 100644
--- a/functional_tests/test_multiprocessing/test_concurrent_shared.py
+++ b/functional_tests/test_multiprocessing/test_concurrent_shared.py
@@ -1,10 +1,11 @@
import os
-from . import support, MPTestBase
+from test_multiprocessing import MPTestBase
class TestConcurrentShared(MPTestBase):
processes = 2
- suitepath = os.path.join(support, 'concurrent_shared')
+ suitepath = os.path.join(os.path.dirname(__file__), 'support',
+ 'concurrent_shared')
def runTest(self):
assert 'Ran 2 tests in 1.' in self.output, "make sure two tests use 1.x seconds (no more than 2 seconsd)"
diff --git a/functional_tests/test_multiprocessing/test_nameerror.py b/functional_tests/test_multiprocessing/test_nameerror.py
index 4837aca..5e58226 100644
--- a/functional_tests/test_multiprocessing/test_nameerror.py
+++ b/functional_tests/test_multiprocessing/test_nameerror.py
@@ -1,10 +1,10 @@
import os
-from . import support, MPTestBase
+from test_multiprocessing import support, MPTestBase
class TestMPNameError(MPTestBase):
processes = 2
- suitepath = os.path.join(support, 'nameerror.py')
+ suitepath = os.path.join(os.path.dirname(__file__), 'support', 'nameerror.py')
def runTest(self):
print str(self.output)
diff --git a/functional_tests/test_multiprocessing/test_process_timeout.py b/functional_tests/test_multiprocessing/test_process_timeout.py
index afef674..6b858f8 100644
--- a/functional_tests/test_multiprocessing/test_process_timeout.py
+++ b/functional_tests/test_multiprocessing/test_process_timeout.py
@@ -1,10 +1,10 @@
import os
-from . import support, MPTestBase
+from test_multiprocessing import MPTestBase
class TestMPTimeout(MPTestBase):
args = ['--process-timeout=1']
- suitepath = os.path.join(support, 'timeout.py')
+ suitepath = os.path.join(os.path.dirname(__file__), 'support', 'timeout.py')
def runTest(self):
assert "TimedOutException: 'timeout.test_timeout'" in self.output