[FLINK-4570] remove conflicting Unicode character This caused Scalastyle to fail, presumably depending on the locale used. After a bit of debugging on the Scalastyle plugin I found out that the number in the error is the byte position.
"Expected identifier, but got Token(COMMA,,,1772,,)" head -c 1772 flink-mesos/src/test/scala/org/apache/flink/mesos/Utils.scala pointed to the Unicode character 'â' which causes Scalastyle to fail in certain environments. This closes #2466 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/502a79d3 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/502a79d3 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/502a79d3 Branch: refs/heads/flip-6 Commit: 502a79d3945584b579db96adcaf916328cba0b76 Parents: e376c00 Author: Maximilian Michels <[email protected]> Authored: Fri Sep 2 17:52:51 2016 +0200 Committer: Maximilian Michels <[email protected]> Committed: Fri Sep 2 18:05:50 2016 +0200 ---------------------------------------------------------------------- flink-mesos/src/test/scala/org/apache/flink/mesos/Utils.scala | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/502a79d3/flink-mesos/src/test/scala/org/apache/flink/mesos/Utils.scala ---------------------------------------------------------------------- diff --git a/flink-mesos/src/test/scala/org/apache/flink/mesos/Utils.scala b/flink-mesos/src/test/scala/org/apache/flink/mesos/Utils.scala index 6f27795..bd6235a 100644 --- a/flink-mesos/src/test/scala/org/apache/flink/mesos/Utils.scala +++ b/flink-mesos/src/test/scala/org/apache/flink/mesos/Utils.scala @@ -16,14 +16,12 @@ * limitations under the License. */ -// disable Scalastyle for now to prevent random failures reported in FLINK-4570 -// scalastyle:off package org.apache.flink.mesos import java.util.concurrent.atomic.AtomicLong import akka.actor._ -import akka.testkit.{TestActorRef, TestFSMRef} +import akka.testkit.TestFSMRef import org.mockito.ArgumentMatcher import scala.collection.JavaConverters._ @@ -49,9 +47,8 @@ object TestFSMUtils { "$" + akka.util.Helpers.base64(l) } - def testFSMRef[S, D, T <: Actor: ClassTag](factory: â T, supervisor: ActorRef) + def testFSMRef[S, D, T <: Actor: ClassTag](factory: => T, supervisor: ActorRef) (implicit ev: T <:< FSM[S, D], system: ActorSystem): TestFSMRef[S, D, T] = { new TestFSMRef(system, Props(factory), supervisor, TestFSMUtils.randomName) } } -// scalastyle:on
