Skip to content

Commit

Permalink
Revert "#629: rename test/_linux.py (and others) to test/test_pslinux…
Browse files Browse the repository at this point in the history
….py in order to ease test discovery for nose and pytest"

This reverts commit 870e00f.
  • Loading branch information
giampaolo committed Jun 4, 2015
1 parent 870e00f commit 931432d
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions test/test_psutil.py
Original file line number Diff line number Diff line change
Expand Up @@ -2767,23 +2767,23 @@ def main():
tests.append(LimitedUserTestCase)

if POSIX:
from test_posix import PosixSpecificTestCase
from _posix import PosixSpecificTestCase
tests.append(PosixSpecificTestCase)

# import the specific platform test suite
stc = None
if LINUX:
from test_linux import LinuxSpecificTestCase as stc
from _linux import LinuxSpecificTestCase as stc
elif WINDOWS:
from test_windows import WindowsSpecificTestCase as stc
from test_windows import TestDualProcessImplementation
from _windows import WindowsSpecificTestCase as stc
from _windows import TestDualProcessImplementation
tests.append(TestDualProcessImplementation)
elif OSX:
from test_osx import OSXSpecificTestCase as stc
from _osx import OSXSpecificTestCase as stc
elif BSD:
from test_bsd import BSDSpecificTestCase as stc
from _bsd import BSDSpecificTestCase as stc
elif SUNOS:
from test_sunos import SunOSSpecificTestCase as stc
from _sunos import SunOSSpecificTestCase as stc
if stc is not None:
tests.append(stc)

Expand Down

0 comments on commit 931432d

Please sign in to comment.