Use assume instead of "return true"

This commit is contained in:
Ilya.Kazakevich
2018-02-14 20:50:35 +03:00
parent f4dad1f859
commit b046f7fb72
2 changed files with 8 additions and 16 deletions
@@ -19,6 +19,7 @@ import com.jetbrains.python.sdk.flavors.VirtualEnvSdkFlavor;
import com.jetbrains.python.tools.sdkTools.SdkCreationType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.Assume;
import org.junit.Test;
import java.io.File;
@@ -37,10 +38,8 @@ import static org.junit.Assert.*;
public class PyPackagingTest extends PyEnvTestCase {
@Override
public void runPythonTest(PyTestTask testTask) {
if (UsefulTestCase.IS_UNDER_TEAMCITY && SystemInfo.isWindows) {
return; //Don't run under Windows as after deleting from created virtualenvs original interpreter got spoiled
}
Assume.assumeFalse("Don't run under Windows as after deleting from created virtualenvs original interpreter got spoiled",
UsefulTestCase.IS_UNDER_TEAMCITY && SystemInfo.isWindows);
super.runPythonTest(testTask);
}
@@ -28,6 +28,7 @@ import com.jetbrains.python.sdk.flavors.PythonSdkFlavor;
import com.jetbrains.python.tools.sdkTools.SdkCreationType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.Assume;
import org.junit.Test;
import java.util.ArrayList;
@@ -672,9 +673,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
@Test
public void testWinEggDebug() {
if (UsefulTestCase.IS_UNDER_TEAMCITY && !SystemInfo.isWindows) {
return; // Only needs to run on windows
}
Assume.assumeFalse("Only needs to run on windows", UsefulTestCase.IS_UNDER_TEAMCITY && !SystemInfo.isWindows);
runPythonTest(new PyDebuggerTask("/debug", "test_winegg.py") {
@Override
public void before() {
@@ -823,9 +822,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
@Test
public void testPyQtQThreadInheritor() {
if (UsefulTestCase.IS_UNDER_TEAMCITY && SystemInfo.isWindows) {
return; //Don't run under Windows
}
Assume.assumeFalse("Don't run under Windows",UsefulTestCase.IS_UNDER_TEAMCITY && SystemInfo.isWindows);
runPythonTest(new PyDebuggerTask("/debug", "test_pyqt1.py") {
@Override
@@ -864,9 +861,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
@Test
public void testPyQtMoveToThread() {
if (UsefulTestCase.IS_UNDER_TEAMCITY && SystemInfo.isWindows) {
return; //Don't run under Windows
}
Assume.assumeFalse("Don't run under Windows", UsefulTestCase.IS_UNDER_TEAMCITY && SystemInfo.isWindows);
runPythonTest(new PyDebuggerTask("/debug", "test_pyqt2.py") {
@Override
@@ -906,9 +901,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
@Test
public void testPyQtQRunnableInheritor() {
if (UsefulTestCase.IS_UNDER_TEAMCITY && SystemInfo.isWindows) {
return; //Don't run under Windows
}
Assume.assumeFalse("Don't run under Windows", UsefulTestCase.IS_UNDER_TEAMCITY && SystemInfo.isWindows);
runPythonTest(new PyDebuggerTask("/debug", "test_pyqt3.py") {
@Override