Skip to content

[LIVY-1085][TEST] Skip remaining R test paths when -DskipRTests is specified #561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gyogal wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −7
Open

[LIVY-1085][TEST] Skip remaining R test paths when -DskipRTests is specified #561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions repl/src/test/scala/org/apache/livy/repl/SharedSessionSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
17 changes: 10 additions & 7 deletions server/src/test/scala/org/apache/livy/server/interactive/InteractiveSessionSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down Expand Up @@ -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(
Expand Down
Loading