Merge pull request outbrain#146 from github/ci-tests-discovery

Minor fixes to single backend integration tests
sjmudd · Nov 23, 2016 · 7d179a0 · 7d179a0
2 parents 3029de5 + b03a263
commit 7d179a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/tests/integration/orchestrator.conf.json b/tests/integration/orchestrator.conf.json
@@ -105,12 +105,10 @@
   "UnseenAgentForgetHours": 6,
   "StaleSeedFailMinutes": 60,
   "SeedAcceptableBytesDiff": 8192,
-  "PseudoGTIDPattern": "drop view if exists `meta`.`_pseudo_gtid_hint__asc",
+  "PseudoGTIDPattern": "drop view if exists `test`.`_pseudo_gtid_hint__asc:",
   "PseudoGTIDPatternIsFixedSubstring": true,
-  "PseudoGTIDPattern": "drop view if exists .*?`_pseudo_gtid_hint__",
-  "PseudoGTIDPatternIsFixedSubstring": false,
-  "__PseudoGTIDMonotonicHint": "asc:",
-  "DetectPseudoGTIDQuery": "SELECT COUNT(*) as pseudo_gtid_exists FROM meta.pseudo_gtid_status WHERE anchor = 1 AND time_generated > NOW() - INTERVAL 2 DAY",
+  "PseudoGTIDMonotonicHint": "asc:",
+  "DetectPseudoGTIDQuery": "",
   "BinlogEventsChunkSize": 10000,
   "BufferBinlogEvents": true,
   "SkipBinlogEventsContaining": [],

diff --git a/tests/integration/test.sh b/tests/integration/test.sh
@@ -115,6 +115,10 @@ build_binary() {
 
 test_all() {
   build_binary
+  if [ $? -ne 0 ] ; then
+    echo "ERROR build failed"
+    return 1
+  fi
   find $tests_path ! -path . -type d -mindepth 1 -maxdepth 1 | xargs ls -td1 | cut -d "/" -f 4 | egrep "$test_pattern" | while read test_name ; do
     test_single "$test_name"
     if [ $? -ne 0 ] ; then