Skip to content

Commit 0a8da15

Browse files
PavelShilin89PavelShilin89
authored
Merge 10be66f into 264025a 
2 parents 264025a + 10be66f commit 0a8da15

16 files changed

+589
-620
lines changed

‎.patterns

Whitespace-only changes.

‎test/clt-tests/base/replication/start-searchd-precach.recb

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,9 @@
22
mkdir -p /var/{run,lib,log}/manticore-${INSTANCE}
33
––– output –––
44
––– input –––
5-
stdbuf -oL searchd -c test/clt-tests/base/searchd-with-flexible-ports.conf | grep -v precach
5+
stdbuf -oL searchd -c test/clt-tests/base/searchd-with-flexible-ports.conf > /dev/null | grep -v precach
66
––– output –––
7-
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})
8-
Copyright (c) 2001-2016, Andrew Aksyonoff
9-
Copyright (c) 2008-2016, Sphinx Technologies Inc (http://sphinxsearch.com)
10-
Copyright (c) 2017-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
11-
[#!/[a-zA-Z]{3}\s[a-zA-Z]{3}\s+[0-9]{1,2}\s[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{3}\s[0-9]{4}/!#] [%{NUMBER}] using config file '/.clt/test/clt-tests/base/searchd-with-flexible-ports.conf' (%{NUMBER} chars)...
12-
starting daemon version '%{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})' ...
13-
listening on %{IPADDR}:%{NUMBER} for mysql
14-
listening on %{IPADDR}:%{NUMBER} for sphinx and http(s)
15-
listening on %{IPADDR}:%{NUMBER} for sphinx and http(s)
167
––– input –––
17-
if timeout 10 grep -qm1 '\[BUDDY\] started' <(tail -n 1000 -f /var/log/manticore-${INSTANCE}/searchd.log); then echo 'Buddy started!'; else echo 'Timeout or failed!'; cat /var/log/manticore/searchd.log;fi
8+
if timeout 10 grep -qm1 'accepting connections' <(tail -n 1000 -f /var/log/manticore-${INSTANCE}/searchd.log); then echo 'Accepting connections!'; else echo 'Timeout or failed!'; fi
189
––– output –––
19-
Buddy started!
10+
Accepting connections!

‎test/clt-tests/base/replication/stop-searchd.recb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
––– input –––
2-
stdbuf -oL searchd --stopwait -c test/clt-tests/base/searchd-with-flexible-ports.conf
2+
stdbuf -oL searchd --stopwait -c test/clt-tests/base/searchd-with-flexible-ports.conf > /dev/null
33
––– output –––
4-
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})
5-
Copyright (c) 2001-2016, Andrew Aksyonoff
6-
Copyright (c) 2008-2016, Sphinx Technologies Inc (http://sphinxsearch.com)
7-
Copyright (c) 2017-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
8-
[#!/[0-9a-zA-Z\:\.\s]+/!#] [%{NUMBER}] using config file '%{PATH}' (%{NUMBER} chars)...
9-
[#!/[0-9a-zA-Z\:\.\s]+/!#] [%{NUMBER}] stop: successfully sent SIGTERM to pid %{NUMBER}

‎test/clt-tests/base/start-searchd-with-buddy.recb

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
––– input –––
2-
stdbuf -oL searchd; if timeout 10 grep -qm1 'accepting' <(tail -n 1000 -f /var/log/manticore/searchd.log); then echo 'Started'; else echo 'Timeout or failed!'; fi
2+
stdbuf -oL searchd > /dev/null; if timeout 10 grep -qm1 '\[BUDDY\] started' <(tail -n 1000 -f /var/log/manticore/searchd.log); then echo 'Buddy started!'; else echo 'Timeout or failed!'; cat /var/log/manticore/searchd.log;fi
33
––– output –––
4-
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})
5-
Copyright (c) 2001-2016, Andrew Aksyonoff
6-
Copyright (c) 2008-2016, Sphinx Technologies Inc (http://sphinxsearch.com)
7-
Copyright (c) 2017-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
8-
[#!/[A-Za-z]{3}\s+[A-Za-z]{3}\s+[0-9]{1,2}\s+[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{3}\s+[0-9]{4}/!#] [%{NUMBER}] using config file '%{PATH}' (%{NUMBER} chars)...
9-
starting daemon version '%{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})' ...
10-
listening on %{IPADDR}:9312 for sphinx and http(s)
11-
listening on %{IPADDR}:9306 for mysql
12-
listening on %{IPADDR}:9308 for sphinx and http(s)
13-
Started
4+
Buddy started!

‎test/clt-tests/base/start-searchd-with-cpustats.recb

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
––– input –––
2-
stdbuf -oL searchd --cpustats
2+
stdbuf -oL searchd --cpustats > /dev/null
33
––– output –––
4-
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})
5-
Copyright (c) 2001-2016, Andrew Aksyonoff
6-
Copyright (c) 2008-2016, Sphinx Technologies Inc (http://sphinxsearch.com)
7-
Copyright (c) 2017-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
8-
[#!/[0-9a-zA-Z\:\.\s]+/!#] [%{NUMBER}] using config file '%{PATH}' (%{NUMBER} chars)...
9-
starting daemon version '%{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})' ...
10-
listening on %{IPADDR}:9312 for sphinx and http(s)
11-
listening on %{IPADDR}:9306 for mysql
12-
listening on %{IPADDR}:9308 for sphinx and http(s)
4+
––– input –––
5+
if timeout 10 grep -qm1 'accepting connections' <(tail -n 1000 -f /var/log/manticore/searchd.log); then echo 'Accepting connections!'; else echo 'Timeout or failed!'; fi
6+
––– output –––
7+
Accepting connections!

‎test/clt-tests/base/start-searchd.recb

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
––– input –––
2-
rm -f /var/log/manticore/searchd.log; stdbuf -oL searchd --stopwait > /dev/null; stdbuf -oL searchd; if timeout 10 grep -qm1 '\[BUDDY\] started' <(tail -n 1000 -f /var/log/manticore/searchd.log); then echo 'Buddy started!'; else echo 'Timeout or failed!'; cat /var/log/manticore/searchd.log;fi
2+
rm -f /var/log/manticore/searchd.log; stdbuf -oL searchd --stopwait > /dev/null; stdbuf -oL searchd > /dev/null
33
––– output –––
4-
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})
5-
Copyright (c) 2001-2016, Andrew Aksyonoff
6-
Copyright (c) 2008-2016, Sphinx Technologies Inc (http://sphinxsearch.com)
7-
Copyright (c) 2017-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
8-
[#!/[0-9a-zA-Z\:\.\s]+/!#] [%{NUMBER}] using config file '%{PATH}' (%{NUMBER} chars)...
9-
starting daemon version '%{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})' ...
10-
listening on %{IPADDR}:9312 for sphinx and http(s)
11-
listening on %{IPADDR}:9306 for mysql
12-
listening on %{IPADDR}:9308 for sphinx and http(s)
13-
Buddy started!
4+
––– input –––
5+
if timeout 10 grep -qm1 'accepting connections' <(tail -n 1000 -f /var/log/manticore/searchd.log); then echo 'Accepting connections!'; else echo 'Timeout or failed!'; fi
6+
––– output –––
7+
Accepting connections!

0 commit comments

Comments
 (0)