Skip to content

Commit 20d24f5

Browse files
committed
Fix @ArtDu comments
1 parent 4c21b89 commit 20d24f5

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

.github/workflows/tests.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
branches: [ master ]
1111

1212
jobs:
13-
tests-ce:
13+
tests-cartridge-container:
1414
runs-on: ubuntu-latest
1515
timeout-minutes: 25
1616
strategy:
@@ -26,20 +26,20 @@ jobs:
2626
cache: 'maven'
2727

2828
- name: Build and run unit tests
29-
run: ./mvnw -B verify -Djacoco.destFile=target/jacoco-ce.exec --file pom.xml
29+
run: ./mvnw -B verify -Djacoco.destFile=target/jacoco-cartridge-container.exec --file pom.xml
3030

3131
- name: Run integration tests
3232
env:
3333
TARANTOOL_SERVER_USER: root
3434
TARANTOOL_SERVER_GROUP: root
3535
TARANTOOL_VERSION: "2.11.2-centos7"
36-
run: ./mvnw -B test -P integration -Djacoco.destFile=target/jacoco-ce.exec --file pom.xml
36+
run: ./mvnw -B test -P integration -Djacoco.destFile=target/jacoco-cartridge-container.exec --file pom.xml
3737

3838
- name: Upload jacoco exec results
3939
uses: actions/upload-artifact@v2
4040
with:
41-
name: tests-ce-jacoco
42-
path: "**/jacoco-ce.exec"
41+
name: tests-cartridge-container-jacoco
42+
path: "**/jacoco-cartridge-container.exec"
4343

4444
tests-ee:
4545
runs-on: ubuntu-latest
@@ -68,7 +68,7 @@ jobs:
6868
name: tests-ee-jacoco
6969
path: "**/jacoco-ee.exec"
7070

71-
tests-matrix:
71+
tests-tarantool-container:
7272
runs-on: ubuntu-latest
7373
timeout-minutes: 25
7474
strategy:
@@ -90,18 +90,18 @@ jobs:
9090
TARANTOOL_VERSION: ${{ matrix.tarantool-version }}
9191
TARANTOOL_SERVER_USER: root
9292
TARANTOOL_SERVER_GROUP: root
93-
run: ./mvnw -B test -P tarantool-container -Djacoco.destFile=target/jacoco-mt.exec --file pom.xml
93+
run: ./mvnw -B test -P tarantool-container -Djacoco.destFile=target/jacoco-tarantool-container.exec --file pom.xml
9494

9595
- name: Upload jacoco exec results
9696
uses: actions/upload-artifact@v2
9797
with:
98-
name: tests-mt-jacoco
99-
path: "**/jacoco-mt.exec"
98+
name: tests-tarantool-container-jacoco
99+
path: "**/jacoco-tarantool-container.exec"
100100

101101
merge-jacoco-report:
102102
name: Jacoco Merge Results
103103
needs:
104-
- tests-ce
104+
- tests-cartridge-container
105105
- tests-ee
106106
runs-on: ubuntu-latest
107107
steps:
@@ -116,7 +116,7 @@ jobs:
116116

117117
- uses: actions/download-artifact@v2
118118
with:
119-
name: tests-ce-jacoco
119+
name: tests-cartridge-container-jacoco
120120
path: .
121121

122122
- uses: actions/download-artifact@v2
@@ -126,7 +126,7 @@ jobs:
126126

127127
- uses: actions/download-artifact@v2
128128
with:
129-
name: tests-mt-jacoco
129+
name: tests-tarantool-container-jacoco
130130
path: .
131131

132132
- name: merge results

src/main/java/org/testcontainers/containers/TarantoolContainerClientHelper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ public final class TarantoolContainerClientHelper {
2525
"Executed script %s with exit code %d, stderr: \"%s\", stdout: \"%s\"";
2626
private static final String EXECUTE_COMMAND_ERROR_TEMPLATE =
2727
"Executed command \"%s\" with exit code %d, stderr: \"%s\", stdout: \"%s\"";
28+
// Generates bash command witch creates executable lua file with connection to required node
29+
// and evaluation of needed lua code
2830
private static final String MTLS_COMMAND_TEMPLATE =
2931
"echo \" " +
3032
" print(require('yaml').encode( " +

0 commit comments

Comments
 (0)