Skip to content

Commit 121aca2

Browse files
author
Bruno Ferreira
committed
Remove duplicated occurrences from test file
With the recent update of codacy-plugins-test this test will fail because now we don't return duplicated occurrences of the same pattern on the same line (with different offsets). ⚠️ ⚠️ ⚠️ ⚠️ This PR dependes on this: codacy/codacy-plugins-test#35
1 parent dd00fd9 commit 121aca2

File tree

4 files changed

+7
-15
lines changed

4 files changed

+7
-15
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ jobs:
3737
- run:
3838
name: Test json
3939
working_directory: ~/codacy-plugins-test
40-
command: sbt -Dcodacy.tests.ignore.descriptions=true "run-main codacy.plugins.DockerTest json $CIRCLE_PROJECT_REPONAME:latest"
40+
command: sbt -Dcodacy.tests.ignore.descriptions=true "runMain codacy.plugins.DockerTest json $CIRCLE_PROJECT_REPONAME:latest"
4141
- run:
4242
name: Test patterns
4343
working_directory: ~/codacy-plugins-test
44-
command: sbt -Dcodacy.tests.noremove=true -Dcodacy.tests.threads=8 "run-main codacy.plugins.DockerTest pattern $CIRCLE_PROJECT_REPONAME:latest"
44+
command: sbt -Dcodacy.tests.noremove=true -Dcodacy.tests.threads=8 "runMain codacy.plugins.DockerTest pattern $CIRCLE_PROJECT_REPONAME:latest"
4545
- deploy:
4646
name: Push application Docker image
4747
command: |

build.sbt

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@ name := """codacy-engine-pylint"""
44

55
version := "1.0-SNAPSHOT"
66

7-
val languageVersion = "2.11.7"
7+
val languageVersion = "2.11.12"
88

99
scalaVersion := languageVersion
1010

11-
resolvers ++= Seq(
12-
"Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/",
13-
"Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/releases"
14-
)
11+
resolvers := Seq("Sonatype OSS Snapshots".at("https://oss.sonatype.org/content/repositories/releases")) ++ resolvers.value
1512

1613
libraryDependencies ++= Seq(
17-
"com.typesafe.play" %% "play-json" % "2.3.8",
14+
"com.typesafe.play" %% "play-json" % "2.4.8",
1815
"com.codacy" %% "codacy-engine-scala-seed" % "2.7.8"
1916
)
2017

@@ -47,7 +44,7 @@ val installAll =
4744
|python3 -m pip uninstall -y pip &&
4845
|apk del wget ca-certificates git &&
4946
|rm -rf /tmp/* &&
50-
|rm -rf /var/cache/apk/*""".stripMargin.replaceAll(System.lineSeparator()," ")
47+
|rm -rf /var/cache/apk/*""".stripMargin.replaceAll(System.lineSeparator(), " ")
5148

5249
mappings in Universal <++= (resourceDirectory in Compile) map { (resourceDir: File) =>
5350
val src = resourceDir / "docs"

project/build.properties

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
#Activator-generated Properties
2-
#Tue Jun 23 14:00:32 EEST 2015
3-
template.uuid=7faf8e1e-4e8d-4387-8159-642b50383096
4-
sbt.version=0.13.8
1+
sbt.version=0.13.17

src/main/resources/docs/tests/E1127.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44

55

66
def function1():
7-
##Err: E1127
87
##Err: E1127
98
return TESTLIST[id:id:]
109

1110
def function2():
12-
##Err: E1127
1311
##Err: E1127
1412
return TESTLIST['0':'1':]
1513

0 commit comments

Comments
 (0)