diff --git a/repl/src/test/scala/org/apache/livy/repl/SharedSessionSpec.scala b/repl/src/test/scala/org/apache/livy/repl/SharedSessionSpec.scala index 3c0b998ff..dbcc006ae 100644 --- a/repl/src/test/scala/org/apache/livy/repl/SharedSessionSpec.scala +++ b/repl/src/test/scala/org/apache/livy/repl/SharedSessionSpec.scala @@ -108,6 +108,7 @@ class SharedSessionSpec extends BaseSessionSpec(Shared) { } it should "execute `1 + 2 = 3` in R" in withSession { session => + assume(!sys.props.getOrElse("skipRTests", "false").toBoolean, "Skipping R tests.") val statement = execute(session, "1 + 2", "sparkr") statement.id should be (0) diff --git a/server/src/test/scala/org/apache/livy/server/interactive/InteractiveSessionSpec.scala b/server/src/test/scala/org/apache/livy/server/interactive/InteractiveSessionSpec.scala index 1efa266ac..5806f147c 100644 --- a/server/src/test/scala/org/apache/livy/server/interactive/InteractiveSessionSpec.scala +++ b/server/src/test/scala/org/apache/livy/server/interactive/InteractiveSessionSpec.scala @@ -56,6 +56,7 @@ class InteractiveSessionSpec extends AnyFunSpec private var session: InteractiveSession = null private val accessManager = new AccessManager(livyConf) + private val skipRTests = sys.props.getOrElse("skipRTests", "false").toBoolean private def createSession( sessionStore: SessionStore = mock[SessionStore], @@ -211,19 +212,21 @@ class InteractiveSessionSpec extends AnyFunSpec (scalaResult \ "status").extract[String] should equal ("ok") (scalaResult \ "execution_count").extract[Int] should equal (1) - val rResult = executeStatement("1 + 2", Some("sparkr")) - rResult should equal (Extraction.decompose(Map( - "status" -> "ok", - "execution_count" -> 2, - "data" -> Map("text/plain" -> "[1] 3"))) - ) + if (!skipRTests) { + val rResult = executeStatement("1 + 2", Some("sparkr")) + rResult should equal (Extraction.decompose(Map( + "status" -> "ok", + "execution_count" -> 2, + "data" -> Map("text/plain" -> "[1] 3"))) + ) + } } withSession("should report an error if accessing an unknown variable") { session => val result = executeStatement("x") val expectedResult = Extraction.decompose(Map( "status" -> "error", - "execution_count" -> 3, + "execution_count" -> (if (skipRTests) 2 else 3), "ename" -> "NameError", "evalue" -> "name 'x' is not defined", "traceback" -> List(