Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
push: false
tags: manticoresoftware/manticore-dind:latest
context: ./clt_tests/dind/
- uses: manticoresoftware/clt@0.6.5
- uses: manticoresoftware/clt@0.7.3
with:
image: manticoresoftware/manticore-dind:latest
test_prefix: clt_tests/tests/
Expand Down
2 changes: 1 addition & 1 deletion clt_tests/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ This command will help you launch and manage the Manticore image with the necess

```bash
docker build -t manticoresoftware/manticore-dind:latest ./clt_tests/dind/
RUN_ARGS="-v $(pwd):/docker --privileged" clt test -d -t ./clt_tests/tests/simple.rec manticoresoftware/manticore-dind:latest
CLT_RUN_ARGS="-v $(pwd):/docker --privileged" clt test -d -t ./clt_tests/tests/simple.rec manticoresoftware/manticore-dind:latest
```
20 changes: 10 additions & 10 deletions clt_tests/tests/config-flexible-with-custom-conf.rec
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ accepting connections
––– input –––
docker exec manticore cat /etc/manticoresearch/manticore.conf.debug | sort
––– output –––
data_dir = /var/lib/manticore
listen = /var/run/mysqld/mysqld.sock:mysql41
listen = 0.0.0.0:9308:http
listen = 172.18.0.2:9315-9325:replication
listen = 9306:mysql41
listen = 9312
log = /var/log/manticore/searchd.log
max_packet_size = 128M
pid_file = /var/run/manticore/searchd.pid
query_log_format = sphinxql
data_dir = /var/lib/manticore
listen = /var/run/mysqld/mysqld.sock:mysql41
listen = 0.0.0.0:9308:http
listen = 172.18.0.2:9315-9325:replication
listen = 9306:mysql41
listen = 9312
log = /var/log/manticore/searchd.log
max_packet_size = 128M
pid_file = /var/run/manticore/searchd.pid
query_log_format = sphinxql
searchd {
}
18 changes: 9 additions & 9 deletions clt_tests/tests/config-flexible-with-default-conf.rec
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ accepting connections
––– input –––
docker exec manticore cat /etc/manticoresearch/manticore.conf.debug | sort
––– output –––
data_dir = /var/lib/manticore
lemmatizer_base = /usr/share/manticore/
listen = /var/run/mysqld/mysqld.sock:mysql41
listen = 172.18.0.2:9312
listen = 172.18.0.2:9315-9325:replication
listen = 9306:mysql41
listen = 9308:http
max_packet_size = 64m
pid_file = /var/run/manticore/searchd.pid
data_dir = /var/lib/manticore
lemmatizer_base = /usr/share/manticore/
listen = /var/run/mysqld/mysqld.sock:mysql41
listen = 172.18.0.2:9312
listen = 172.18.0.2:9315-9325:replication
listen = 9306:mysql41
listen = 9308:http
max_packet_size = 64m
pid_file = /run/manticore/searchd.pid
common {
searchd {
}
Expand Down
4 changes: 2 additions & 2 deletions clt_tests/tests/plain-indexes-desired.rec
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ docker exec manticore mysql -e "SHOW TABLES\G;"
––– output –––
*************************** 1. row ***************************
Table: idx1
Type: local
Type: local
*************************** 2. row ***************************
Table: idx2
Type: local
Type: local
––– input –––
docker exec manticore mysql -e "SELECT * FROM idx1\G;"
––– output –––
Expand Down
14 changes: 7 additions & 7 deletions clt_tests/tests/test-backup-restore.rec
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,15 @@ Manticore config file: /etc/manticoresearch/manticore.conf.sh
Tables to backup: all tables
Backup dir: /tmp
Manticore config
endpoint = http://127.0.0.1:9308
endpoint = http://127.0.0.1:9308
Manticore config
endpoint = http://127.0.0.1:9312
endpoint = http://127.0.0.1:9312
Manticore versions:
manticore: %{SEMVER} %{COMMITDATE}#!/(\s*dev)*/!#
columnar: %{SEMVER} %{COMMITDATE}
secondary: %{SEMVER} %{COMMITDATE}
knn: %{SEMVER} %{COMMITDATE}
buddy: %{SEMVER_EXT}
manticore: %{SEMVER} %{COMMITDATE}#!/(\s*dev)*/!#
columnar: %{SEMVER} %{COMMITDATE}
secondary: %{SEMVER} %{COMMITDATE}
knn: %{SEMVER} %{COMMITDATE}
buddy: %{SEMVER_EXT}
%{DATETIME} [Info] Starting the backup...
%{DATETIME} [Info] Backing up config files...
%{DATETIME} [Info] config files - OK
Expand Down
32 changes: 16 additions & 16 deletions clt_tests/tests/test-one-liner.rec
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,28 @@ docker exec manticore mysql -e "SHOW TABLES\G"
––– output –––
*************************** 1. row ***************************
Table: films
Type: rt
Type: rt
––– input –––
docker exec manticore mysql -e "SELECT * FROM films LIMIT 3\G"
––– output –––
*************************** 1. row ***************************
id: 19
title: AMADEUS HOLY
description: A Emotional Display of a Pioneer And a Technical Writer who must Battle a Man in A Baloon
category_id: 1
id: 19
title: AMADEUS HOLY
description: A Emotional Display of a Pioneer And a Technical Writer who must Battle a Man in A Baloon
category_id: 1
release_year: 2008
rental_rate: 0.990000
rental_rate: 0.990000
*************************** 2. row ***************************
id: 21
title: AMERICAN CIRCUS
description: A Insightful Drama of a Girl And a Astronaut who must Face a Database Administrator in A Shark Tank
category_id: 1
id: 21
title: AMERICAN CIRCUS
description: A Insightful Drama of a Girl And a Astronaut who must Face a Database Administrator in A Shark Tank
category_id: 1
release_year: 2009
rental_rate: 4.990000
rental_rate: 4.990000
*************************** 3. row ***************************
id: 29
title: ANTITRUST TOMATOES
description: A Fateful Yarn of a Womanizer And a Feminist who must Succumb a Database Administrator in Ancient India
category_id: 1
id: 29
title: ANTITRUST TOMATOES
description: A Fateful Yarn of a Womanizer And a Feminist who must Succumb a Database Administrator in Ancient India
category_id: 1
release_year: 2005
rental_rate: 2.990000
rental_rate: 2.990000
6 changes: 3 additions & 3 deletions clt_tests/tests/test-postgres-docker.rec
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ docker exec manticore mysql -h0 -P9306 -e "SHOW TABLES\G;"
––– output –––
*************************** 1. row ***************************
Table: text_idx
Type: local
Type: local
––– input –––
docker exec manticore mysql -h0 -P9306 -e "SELECT * FROM text_idx\G;"
––– output –––
*************************** 1. row ***************************
id: 1
id: 1
name: Element 1
*************************** 2. row ***************************
id: 2
id: 2
name: Element 2