You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@livy.apache.org by js...@apache.org on 2017/06/27 06:39:11 UTC
[30/50] [abbrv] incubator-livy git commit: LIVY-331. Fix flaky test
'interactive session should not gc-ed if session timeout check is off'.
(#310)
LIVY-331. Fix flaky test 'interactive session should not gc-ed if session timeout check is off'. (#310)
Project: http://git-wip-us.apache.org/repos/asf/incubator-livy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy/commit/eb7e6ccf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy/tree/eb7e6ccf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy/diff/eb7e6ccf
Branch: refs/heads/master
Commit: eb7e6ccfd1809e5738573ce7f0761cd8f879d121
Parents: 2ff8f5c
Author: Saisai Shao <sa...@gmail.com>
Authored: Wed Mar 15 05:37:08 2017 +0800
Committer: Alex Man <al...@users.noreply.github.com>
Committed: Tue Mar 14 14:37:08 2017 -0700
----------------------------------------------------------------------
.../scala/com/cloudera/livy/sessions/SessionManagerSpec.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/eb7e6ccf/server/src/test/scala/com/cloudera/livy/sessions/SessionManagerSpec.scala
----------------------------------------------------------------------
diff --git a/server/src/test/scala/com/cloudera/livy/sessions/SessionManagerSpec.scala b/server/src/test/scala/com/cloudera/livy/sessions/SessionManagerSpec.scala
index 241ba27..79f2482 100644
--- a/server/src/test/scala/com/cloudera/livy/sessions/SessionManagerSpec.scala
+++ b/server/src/test/scala/com/cloudera/livy/sessions/SessionManagerSpec.scala
@@ -23,7 +23,7 @@ import scala.concurrent.duration._
import scala.language.postfixOps
import scala.util.{Failure, Try}
-import org.mockito.Mockito.{never, verify, when}
+import org.mockito.Mockito.{doReturn, never, verify, when}
import org.scalatest.{FunSpec, Matchers}
import org.scalatest.concurrent.Eventually._
import org.scalatest.mock.MockitoSugar.mock
@@ -83,7 +83,7 @@ class SessionManagerSpec extends FunSpec with Matchers with LivyBaseUnitTestSuit
def testSessionGC(session: Session, sm: SessionManager[_, _]): Unit = {
def changeStateAndCheck(s: SessionState)(fn: SessionManager[_, _] => Unit): Unit = {
- when(session.state).thenReturn(s)
+ doReturn(s).when(session).state
Await.result(sm.collectGarbage(), Duration.Inf)
fn(sm)
}