Skip to content

Commit

Permalink
fixed test 376; added substitution for AF_INET error at test
Browse files Browse the repository at this point in the history
  • Loading branch information
@tomatolog @sanikolaev
tomatolog authored and sanikolaev committed Aug 21, 2023
1 parent 71f81d8 commit c6bfb30
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion test/helpers.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2268,13 +2268,15 @@ class SphinxConfig
'/error when sending data: WSA error 10057/', // windows
'/connect and query timed out/', // also windows
'/receiving failure .*$/', // linux (errno 111) and mac (errno 64)
'/end of file/', // fresh bison from homebrew emits 'end of file' instead of '$end'
'/end of file/', // fresh bison from homebrew emits 'end of file' instead of '$end',
'/(.* error: no AF_INET address found for:.*, error)(.*)/'
],
[
"receiving failure (refused or timedout, substituted)",
"receiving failure (refused or timedout, substituted)",
"receiving failure (refused or timedout, substituted)",
"\$end",
"$1: substituted"
], $s );
return $s;
}
Expand Down
2 changes: 1 addition & 1 deletion test/test_376/model.bin
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a:1:{i:0;a:31:{i:0;a:2:{s:8:"sphinxql";s:26:"create table pq1 type='pq'";s:14:"total_affected";i:0;}i:1;a:2:{s:8:"sphinxql";s:26:"create table pq2 type='pq'";s:14:"total_affected";i:0;}i:2;a:2:{s:8:"sphinxql";s:26:"create table pq3 type='pq'";s:14:"total_affected";i:0;}i:3;a:2:{s:8:"sphinxql";s:19:"create cluster test";s:14:"total_affected";i:0;}i:4;a:2:{s:8:"sphinxql";s:26:"ALTER CLUSTER test ADD pq1";s:14:"total_affected";i:0;}i:5;a:2:{s:8:"sphinxql";s:45:"INSERT INTO test:pq1 (query) VALUES('test 1')";s:14:"total_affected";i:1;}i:6;a:2:{s:8:"sphinxql";s:45:"INSERT INTO test:pq1 (query) VALUES('test 2')";s:14:"total_affected";i:1;}i:7;a:2:{s:8:"sphinxql";s:45:"INSERT INTO test:pq1 (query) VALUES('test 3')";s:14:"total_affected";i:1;}i:8;a:3:{s:5:"agent";s:1:"1";s:8:"sphinxql";s:43:"join cluster test '%addr_connect%' as nodes";s:14:"total_affected";i:0;}i:9;a:3:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:37:"join cluster test at '%addr_connect%'";s:14:"total_affected";i:0;}i:10;a:2:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:42:"/* stop-agent => stop=ok, return code=0 */";}i:11;a:2:{s:5:"agent";s:1:"1";s:8:"sphinxql";s:42:"/* stop-agent => stop=ok, return code=0 */";}i:12;a:2:{s:8:"sphinxql";s:46:"INSERT INTO test:pq1 (query) VALUES('test 11')";s:14:"total_affected";i:1;}i:13;a:2:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:46:"/* start-agent => ; start=ok, return code=0 */";}i:14;a:4:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:48:"debug wait test like 'state' option 'timeout'=30";s:10:"total_rows";i:1;s:4:"rows";a:1:{i:0;a:2:{s:4:"name";s:5:"state";s:5:"Value";s:6:"synced";}}}i:15;a:4:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:22:"SELECT * FROM test:pq1";s:10:"total_rows";i:4;s:4:"rows";a:4:{i:0;a:4:{s:2:"id";s:13:"1677721600002";s:5:"query";s:6:"test 2";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:1;a:4:{s:2:"id";s:13:"1677721600003";s:5:"query";s:6:"test 3";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:2;a:4:{s:2:"id";s:13:"1677721600004";s:5:"query";s:7:"test 11";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:3;a:4:{s:2:"id";s:13:"1677721600001";s:5:"query";s:6:"test 1";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}}}i:16;a:2:{s:5:"agent";s:1:"1";s:8:"sphinxql";s:46:"/* start-agent => ; start=ok, return code=0 */";}i:17;a:4:{s:5:"agent";s:1:"1";s:8:"sphinxql";s:48:"debug wait test like 'state' option 'timeout'=30";s:10:"total_rows";i:1;s:4:"rows";a:1:{i:0;a:2:{s:4:"name";s:5:"state";s:5:"Value";s:6:"synced";}}}i:18;a:4:{s:5:"agent";s:1:"1";s:8:"sphinxql";s:22:"SELECT * FROM test:pq1";s:10:"total_rows";i:4;s:4:"rows";a:4:{i:0;a:4:{s:2:"id";s:13:"1677721600002";s:5:"query";s:6:"test 2";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:1;a:4:{s:2:"id";s:13:"1677721600003";s:5:"query";s:6:"test 3";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:2;a:4:{s:2:"id";s:13:"1677721600004";s:5:"query";s:7:"test 11";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:3;a:4:{s:2:"id";s:13:"1677721600001";s:5:"query";s:6:"test 1";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}}}i:19;a:3:{s:5:"agent";s:1:"1";s:8:"sphinxql";s:46:"INSERT INTO test:pq1 (query) VALUES('test 12')";s:14:"total_affected";i:1;}i:20;a:4:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:57:"debug wait test status 6 like 'state' option 'timeout'=30";s:10:"total_rows";i:1;s:4:"rows";a:1:{i:0;a:2:{s:4:"name";s:5:"state";s:5:"Value";s:1:"6";}}}i:21;a:4:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:22:"SELECT * FROM test:pq1";s:10:"total_rows";i:5;s:4:"rows";a:5:{i:0;a:4:{s:2:"id";s:13:"1677721600002";s:5:"query";s:6:"test 2";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:1;a:4:{s:2:"id";s:13:"1677721600003";s:5:"query";s:6:"test 3";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:2;a:4:{s:2:"id";s:13:"1677721600004";s:5:"query";s:7:"test 11";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:3;a:4:{s:2:"id";s:17:"72059271759527937";s:5:"query";s:7:"test 12";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:4;a:4:{s:2:"id";s:13:"1677721600001";s:5:"query";s:6:"test 1";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}}}i:22;a:2:{s:8:"sphinxql";s:27:"ALTER CLUSTER test DROP pq1";s:14:"total_affected";i:0;}i:23;a:2:{s:8:"sphinxql";s:14:"drop table pq1";s:14:"total_affected";i:0;}i:24;a:2:{s:8:"sphinxql";s:14:"drop table pq2";s:14:"total_affected";i:0;}i:25;a:2:{s:8:"sphinxql";s:14:"drop table pq3";s:14:"total_affected";i:0;}i:26;a:2:{s:8:"sphinxql";s:19:"DELETE cluster test";s:14:"total_affected";i:0;}i:27;a:4:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:42:"join cluster test2 at 'test_tmg_890123765'";s:5:"errno";i:1064;s:5:"error";s:200:"cluster 'test2', no nodes available(test_tmg_890123765), error: test_tmg_890123765 invalid node, error: no AF_INET address found for: test_tmg_890123765, error -3: Temporary failure in name resolution";}i:28;a:4:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:47:"join cluster test2 at 'test_tmg_890123765:9312'";s:5:"errno";i:1064;s:5:"error";s:210:"cluster 'test2', no nodes available(test_tmg_890123765:9312), error: test_tmg_890123765:9312 invalid node, error: no AF_INET address found for: test_tmg_890123765, error -3: Temporary failure in name resolution";}i:29;a:4:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:52:"join cluster test2 at 'test_tmg_890123765:9312:test'";s:5:"errno";i:1064;s:5:"error";s:159:"cluster 'test2', no nodes available(test_tmg_890123765:9312:test), error: test_tmg_890123765:9312:test invalid node, error: unknown listen protocol type 'test'";}i:30;a:4:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:52:"join cluster test2 at 'test_tmg_890123765:9312:9325'";s:5:"errno";i:1064;s:5:"error";s:159:"cluster 'test2', no nodes available(test_tmg_890123765:9312:9325), error: test_tmg_890123765:9312:9325 invalid node, error: unknown listen protocol type '9325'";}}}
a:1:{i:0;a:31:{i:0;a:2:{s:8:"sphinxql";s:26:"create table pq1 type='pq'";s:14:"total_affected";i:0;}i:1;a:2:{s:8:"sphinxql";s:26:"create table pq2 type='pq'";s:14:"total_affected";i:0;}i:2;a:2:{s:8:"sphinxql";s:26:"create table pq3 type='pq'";s:14:"total_affected";i:0;}i:3;a:2:{s:8:"sphinxql";s:19:"create cluster test";s:14:"total_affected";i:0;}i:4;a:2:{s:8:"sphinxql";s:26:"ALTER CLUSTER test ADD pq1";s:14:"total_affected";i:0;}i:5;a:2:{s:8:"sphinxql";s:45:"INSERT INTO test:pq1 (query) VALUES('test 1')";s:14:"total_affected";i:1;}i:6;a:2:{s:8:"sphinxql";s:45:"INSERT INTO test:pq1 (query) VALUES('test 2')";s:14:"total_affected";i:1;}i:7;a:2:{s:8:"sphinxql";s:45:"INSERT INTO test:pq1 (query) VALUES('test 3')";s:14:"total_affected";i:1;}i:8;a:3:{s:5:"agent";s:1:"1";s:8:"sphinxql";s:43:"join cluster test '%addr_connect%' as nodes";s:14:"total_affected";i:0;}i:9;a:3:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:37:"join cluster test at '%addr_connect%'";s:14:"total_affected";i:0;}i:10;a:2:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:42:"/* stop-agent => stop=ok, return code=0 */";}i:11;a:2:{s:5:"agent";s:1:"1";s:8:"sphinxql";s:42:"/* stop-agent => stop=ok, return code=0 */";}i:12;a:2:{s:8:"sphinxql";s:46:"INSERT INTO test:pq1 (query) VALUES('test 11')";s:14:"total_affected";i:1;}i:13;a:2:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:46:"/* start-agent => ; start=ok, return code=0 */";}i:14;a:4:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:48:"debug wait test like 'state' option 'timeout'=30";s:10:"total_rows";i:1;s:4:"rows";a:1:{i:0;a:2:{s:4:"name";s:5:"state";s:5:"Value";s:6:"synced";}}}i:15;a:4:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:22:"SELECT * FROM test:pq1";s:10:"total_rows";i:4;s:4:"rows";a:4:{i:0;a:4:{s:2:"id";s:13:"1677721600002";s:5:"query";s:6:"test 2";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:1;a:4:{s:2:"id";s:13:"1677721600003";s:5:"query";s:6:"test 3";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:2;a:4:{s:2:"id";s:13:"1677721600004";s:5:"query";s:7:"test 11";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:3;a:4:{s:2:"id";s:13:"1677721600001";s:5:"query";s:6:"test 1";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}}}i:16;a:2:{s:5:"agent";s:1:"1";s:8:"sphinxql";s:46:"/* start-agent => ; start=ok, return code=0 */";}i:17;a:4:{s:5:"agent";s:1:"1";s:8:"sphinxql";s:48:"debug wait test like 'state' option 'timeout'=30";s:10:"total_rows";i:1;s:4:"rows";a:1:{i:0;a:2:{s:4:"name";s:5:"state";s:5:"Value";s:6:"synced";}}}i:18;a:4:{s:5:"agent";s:1:"1";s:8:"sphinxql";s:22:"SELECT * FROM test:pq1";s:10:"total_rows";i:4;s:4:"rows";a:4:{i:0;a:4:{s:2:"id";s:13:"1677721600002";s:5:"query";s:6:"test 2";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:1;a:4:{s:2:"id";s:13:"1677721600003";s:5:"query";s:6:"test 3";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:2;a:4:{s:2:"id";s:13:"1677721600004";s:5:"query";s:7:"test 11";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:3;a:4:{s:2:"id";s:13:"1677721600001";s:5:"query";s:6:"test 1";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}}}i:19;a:3:{s:5:"agent";s:1:"1";s:8:"sphinxql";s:46:"INSERT INTO test:pq1 (query) VALUES('test 12')";s:14:"total_affected";i:1;}i:20;a:4:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:57:"debug wait test status 6 like 'state' option 'timeout'=30";s:10:"total_rows";i:1;s:4:"rows";a:1:{i:0;a:2:{s:4:"name";s:5:"state";s:5:"Value";s:1:"6";}}}i:21;a:4:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:22:"SELECT * FROM test:pq1";s:10:"total_rows";i:5;s:4:"rows";a:5:{i:0;a:4:{s:2:"id";s:13:"1677721600002";s:5:"query";s:6:"test 2";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:1;a:4:{s:2:"id";s:13:"1677721600003";s:5:"query";s:6:"test 3";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:2;a:4:{s:2:"id";s:13:"1677721600004";s:5:"query";s:7:"test 11";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:3;a:4:{s:2:"id";s:17:"72059271759527937";s:5:"query";s:7:"test 12";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}i:4;a:4:{s:2:"id";s:13:"1677721600001";s:5:"query";s:6:"test 1";s:4:"tags";s:0:"";s:7:"filters";s:0:"";}}}i:22;a:2:{s:8:"sphinxql";s:27:"ALTER CLUSTER test DROP pq1";s:14:"total_affected";i:0;}i:23;a:2:{s:8:"sphinxql";s:14:"drop table pq1";s:14:"total_affected";i:0;}i:24;a:2:{s:8:"sphinxql";s:14:"drop table pq2";s:14:"total_affected";i:0;}i:25;a:2:{s:8:"sphinxql";s:14:"drop table pq3";s:14:"total_affected";i:0;}i:26;a:2:{s:8:"sphinxql";s:19:"DELETE cluster test";s:14:"total_affected";i:0;}i:27;a:4:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:42:"join cluster test2 at 'test_tmg_890123765'";s:5:"errno";i:1064;s:5:"error";s:172:"cluster 'test2', no nodes available(test_tmg_890123765), error: test_tmg_890123765 invalid node, error: no AF_INET address found for: test_tmg_890123765, error: substituted";}i:28;a:4:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:47:"join cluster test2 at 'test_tmg_890123765:9312'";s:5:"errno";i:1064;s:5:"error";s:182:"cluster 'test2', no nodes available(test_tmg_890123765:9312), error: test_tmg_890123765:9312 invalid node, error: no AF_INET address found for: test_tmg_890123765, error: substituted";}i:29;a:4:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:52:"join cluster test2 at 'test_tmg_890123765:9312:test'";s:5:"errno";i:1064;s:5:"error";s:159:"cluster 'test2', no nodes available(test_tmg_890123765:9312:test), error: test_tmg_890123765:9312:test invalid node, error: unknown listen protocol type 'test'";}i:30;a:4:{s:5:"agent";s:1:"2";s:8:"sphinxql";s:52:"join cluster test2 at 'test_tmg_890123765:9312:9325'";s:5:"errno";i:1064;s:5:"error";s:159:"cluster 'test2', no nodes available(test_tmg_890123765:9312:9325), error: test_tmg_890123765:9312:9325 invalid node, error: unknown listen protocol type '9325'";}}}

0 comments on commit c6bfb30

Please sign in to comment.