Skip to content

Commit 96be981

Browse files
KlimTodrikdjklim87
KlimTodrik
and
djklim87
authored
Feat: Bump CLT version (#122)
* Feat: Bump CLT version * Feat: Fix CLT tests --------- Co-authored-by: djklim87 <klim@manticoresearch.com>
1 parent 9bef2ae commit 96be981

8 files changed

Lines changed: 49 additions & 49 deletions

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
push: false
1919
tags: manticoresoftware/manticore-dind:latest
2020
context: ./clt_tests/dind/
21-
- uses: manticoresoftware/clt@0.6.5
21+
- uses: manticoresoftware/clt@0.7.3
2222
with:
2323
image: manticoresoftware/manticore-dind:latest
2424
test_prefix: clt_tests/tests/

‎clt_tests/readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ This command will help you launch and manage the Manticore image with the necess
1717

1818
```bash
1919
docker build -t manticoresoftware/manticore-dind:latest ./clt_tests/dind/
20-
RUN_ARGS="-v $(pwd):/docker --privileged" clt test -d -t ./clt_tests/tests/simple.rec manticoresoftware/manticore-dind:latest
20+
CLT_RUN_ARGS="-v $(pwd):/docker --privileged" clt test -d -t ./clt_tests/tests/simple.rec manticoresoftware/manticore-dind:latest
2121
```

‎clt_tests/tests/config-flexible-with-custom-conf.rec‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ accepting connections
1414
––– input –––
1515
docker exec manticore cat /etc/manticoresearch/manticore.conf.debug | sort
1616
––– output –––
17-
data_dir = /var/lib/manticore
18-
listen = /var/run/mysqld/mysqld.sock:mysql41
19-
listen = 0.0.0.0:9308:http
20-
listen = 172.18.0.2:9315-9325:replication
21-
listen = 9306:mysql41
22-
listen = 9312
23-
log = /var/log/manticore/searchd.log
24-
max_packet_size = 128M
25-
pid_file = /var/run/manticore/searchd.pid
26-
query_log_format = sphinxql
17+
data_dir = /var/lib/manticore
18+
listen = /var/run/mysqld/mysqld.sock:mysql41
19+
listen = 0.0.0.0:9308:http
20+
listen = 172.18.0.2:9315-9325:replication
21+
listen = 9306:mysql41
22+
listen = 9312
23+
log = /var/log/manticore/searchd.log
24+
max_packet_size = 128M
25+
pid_file = /var/run/manticore/searchd.pid
26+
query_log_format = sphinxql
2727
searchd {
2828
}

‎clt_tests/tests/config-flexible-with-default-conf.rec‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ accepting connections
1010
––– input –––
1111
docker exec manticore cat /etc/manticoresearch/manticore.conf.debug | sort
1212
––– output –––
13-
data_dir = /var/lib/manticore
14-
lemmatizer_base = /usr/share/manticore/
15-
listen = /var/run/mysqld/mysqld.sock:mysql41
16-
listen = 172.18.0.2:9312
17-
listen = 172.18.0.2:9315-9325:replication
18-
listen = 9306:mysql41
19-
listen = 9308:http
20-
max_packet_size = 64m
21-
pid_file = /var/run/manticore/searchd.pid
13+
data_dir = /var/lib/manticore
14+
lemmatizer_base = /usr/share/manticore/
15+
listen = /var/run/mysqld/mysqld.sock:mysql41
16+
listen = 172.18.0.2:9312
17+
listen = 172.18.0.2:9315-9325:replication
18+
listen = 9306:mysql41
19+
listen = 9308:http
20+
max_packet_size = 64m
21+
pid_file = /run/manticore/searchd.pid
2222
common {
2323
searchd {
2424
}

‎clt_tests/tests/plain-indexes-desired.rec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ docker exec manticore mysql -e "SHOW TABLES\G;"
1212
––– output –––
1313
*************************** 1. row ***************************
1414
Table: idx1
15-
Type: local
15+
Type: local
1616
*************************** 2. row ***************************
1717
Table: idx2
18-
Type: local
18+
Type: local
1919
––– input –––
2020
docker exec manticore mysql -e "SELECT * FROM idx1\G;"
2121
––– output –––

‎clt_tests/tests/test-backup-restore.rec‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@ Manticore config file: /etc/manticoresearch/manticore.conf.sh
9090
Tables to backup: all tables
9191
Backup dir: /tmp
9292
Manticore config
93-
endpoint = http://127.0.0.1:9308
93+
endpoint = http://127.0.0.1:9308
9494
Manticore config
95-
endpoint = http://127.0.0.1:9312
95+
endpoint = http://127.0.0.1:9312
9696
Manticore versions:
97-
manticore: %{SEMVER} %{COMMITDATE}#!/(\s*dev)*/!#
98-
columnar: %{SEMVER} %{COMMITDATE}
99-
secondary: %{SEMVER} %{COMMITDATE}
100-
knn: %{SEMVER} %{COMMITDATE}
101-
buddy: %{SEMVER_EXT}
97+
manticore: %{SEMVER} %{COMMITDATE}#!/(\s*dev)*/!#
98+
columnar: %{SEMVER} %{COMMITDATE}
99+
secondary: %{SEMVER} %{COMMITDATE}
100+
knn: %{SEMVER} %{COMMITDATE}
101+
buddy: %{SEMVER_EXT}
102102
%{DATETIME} [Info] Starting the backup...
103103
%{DATETIME} [Info] Backing up config files...
104104
%{DATETIME} [Info] config files - OK

‎clt_tests/tests/test-one-liner.rec‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,28 @@ docker exec manticore mysql -e "SHOW TABLES\G"
1313
––– output –––
1414
*************************** 1. row ***************************
1515
Table: films
16-
Type: rt
16+
Type: rt
1717
––– input –––
1818
docker exec manticore mysql -e "SELECT * FROM films LIMIT 3\G"
1919
––– output –––
2020
*************************** 1. row ***************************
21-
id: 19
22-
title: AMADEUS HOLY
23-
description: A Emotional Display of a Pioneer And a Technical Writer who must Battle a Man in A Baloon
24-
category_id: 1
21+
id: 19
22+
title: AMADEUS HOLY
23+
description: A Emotional Display of a Pioneer And a Technical Writer who must Battle a Man in A Baloon
24+
category_id: 1
2525
release_year: 2008
26-
rental_rate: 0.990000
26+
rental_rate: 0.990000
2727
*************************** 2. row ***************************
28-
id: 21
29-
title: AMERICAN CIRCUS
30-
description: A Insightful Drama of a Girl And a Astronaut who must Face a Database Administrator in A Shark Tank
31-
category_id: 1
28+
id: 21
29+
title: AMERICAN CIRCUS
30+
description: A Insightful Drama of a Girl And a Astronaut who must Face a Database Administrator in A Shark Tank
31+
category_id: 1
3232
release_year: 2009
33-
rental_rate: 4.990000
33+
rental_rate: 4.990000
3434
*************************** 3. row ***************************
35-
id: 29
36-
title: ANTITRUST TOMATOES
37-
description: A Fateful Yarn of a Womanizer And a Feminist who must Succumb a Database Administrator in Ancient India
38-
category_id: 1
35+
id: 29
36+
title: ANTITRUST TOMATOES
37+
description: A Fateful Yarn of a Womanizer And a Feminist who must Succumb a Database Administrator in Ancient India
38+
category_id: 1
3939
release_year: 2005
40-
rental_rate: 2.990000
40+
rental_rate: 2.990000

‎clt_tests/tests/test-postgres-docker.rec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ docker exec manticore mysql -h0 -P9306 -e "SHOW TABLES\G;"
2525
––– output –––
2626
*************************** 1. row ***************************
2727
Table: text_idx
28-
Type: local
28+
Type: local
2929
––– input –––
3030
docker exec manticore mysql -h0 -P9306 -e "SELECT * FROM text_idx\G;"
3131
––– output –––
3232
*************************** 1. row ***************************
33-
id: 1
33+
id: 1
3434
name: Element 1
3535
*************************** 2. row ***************************
36-
id: 2
36+
id: 2
3737
name: Element 2

0 commit comments

Comments
 (0)