diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2015-06-04 03:42:11 +0200 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2015-06-04 03:42:11 +0200 |
commit | 870e00f71c15ef39f8259ff16b682e495ea5d6eb (patch) | |
tree | a6ebcc6f923932dbc7533c8ac5a0b9713afa0a11 | |
parent | d9f580538224d63f1a1273854293e2c87b0144dd (diff) | |
download | psutil-870e00f71c15ef39f8259ff16b682e495ea5d6eb.tar.gz |
#629: rename test/_linux.py (and others) to test/test_pslinux.py in order to ease test discovery for nose and pytest
-rw-r--r-- | test/test_bsd.py (renamed from test/_bsd.py) | 0 | ||||
-rw-r--r-- | test/test_linux.py (renamed from test/_linux.py) | 0 | ||||
-rw-r--r-- | test/test_osx.py (renamed from test/_osx.py) | 0 | ||||
-rw-r--r-- | test/test_posix.py (renamed from test/_posix.py) | 0 | ||||
-rw-r--r-- | test/test_psutil.py | 14 | ||||
-rw-r--r-- | test/test_sunos.py (renamed from test/_sunos.py) | 0 | ||||
-rw-r--r-- | test/test_windows.py (renamed from test/_windows.py) | 0 |
7 files changed, 7 insertions, 7 deletions
diff --git a/test/_bsd.py b/test/test_bsd.py index 76f12442..76f12442 100644 --- a/test/_bsd.py +++ b/test/test_bsd.py diff --git a/test/_linux.py b/test/test_linux.py index 5d7f0521..5d7f0521 100644 --- a/test/_linux.py +++ b/test/test_linux.py diff --git a/test/_osx.py b/test/test_osx.py index 6e6e4380..6e6e4380 100644 --- a/test/_osx.py +++ b/test/test_osx.py diff --git a/test/_posix.py b/test/test_posix.py index 2a263a3f..2a263a3f 100644 --- a/test/_posix.py +++ b/test/test_posix.py diff --git a/test/test_psutil.py b/test/test_psutil.py index 470dafc4..ed85708c 100644 --- a/test/test_psutil.py +++ b/test/test_psutil.py @@ -2767,23 +2767,23 @@ def main(): tests.append(LimitedUserTestCase) if POSIX: - from _posix import PosixSpecificTestCase + from test_posix import PosixSpecificTestCase tests.append(PosixSpecificTestCase) # import the specific platform test suite stc = None if LINUX: - from _linux import LinuxSpecificTestCase as stc + from test_linux import LinuxSpecificTestCase as stc elif WINDOWS: - from _windows import WindowsSpecificTestCase as stc - from _windows import TestDualProcessImplementation + from test_windows import WindowsSpecificTestCase as stc + from test_windows import TestDualProcessImplementation tests.append(TestDualProcessImplementation) elif OSX: - from _osx import OSXSpecificTestCase as stc + from test_osx import OSXSpecificTestCase as stc elif BSD: - from _bsd import BSDSpecificTestCase as stc + from test_bsd import BSDSpecificTestCase as stc elif SUNOS: - from _sunos import SunOSSpecificTestCase as stc + from test_sunos import SunOSSpecificTestCase as stc if stc is not None: tests.append(stc) diff --git a/test/_sunos.py b/test/test_sunos.py index 3d54ccd8..3d54ccd8 100644 --- a/test/_sunos.py +++ b/test/test_sunos.py diff --git a/test/_windows.py b/test/test_windows.py index a0a22052..a0a22052 100644 --- a/test/_windows.py +++ b/test/test_windows.py |