You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2017/07/24 22:37:41 UTC

[1/2] lucene-solr:branch_7x: SOLR-10494: fix smoker

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_7_0 477c2188e -> 25637fbba
  refs/heads/branch_7x 8ea4c0790 -> 34e3ef7d7


SOLR-10494: fix smoker

(cherry picked from commit 56ad1a7a9b049e7399c0e482dcf6f4f395472f5b)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/34e3ef7d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/34e3ef7d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/34e3ef7d

Branch: refs/heads/branch_7x
Commit: 34e3ef7d7b0823085ec34166af13ced1df56e09a
Parents: 8ea4c07
Author: Chris Hostetter <ho...@apache.org>
Authored: Mon Jul 24 15:36:29 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Mon Jul 24 15:37:13 2017 -0700

----------------------------------------------------------------------
 dev-tools/scripts/smokeTestRelease.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/34e3ef7d/dev-tools/scripts/smokeTestRelease.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py
index 1083a09..01706a7 100644
--- a/dev-tools/scripts/smokeTestRelease.py
+++ b/dev-tools/scripts/smokeTestRelease.py
@@ -858,11 +858,11 @@ def testSolrExample(unpackPath, javaPath, isSrc):
     run('sh ./exampledocs/test_utf8.sh http://localhost:8983/solr/techproducts', 'utf8.log')
     print('      run query...')
     s = load('http://localhost:8983/solr/techproducts/select/?q=video')
-    if s.find('<result name="response" numFound="3" start="0">') == -1:
+    if s.find('"numFound":3,"start":0') == -1:
       print('FAILED: response is:\n%s' % s)
       raise RuntimeError('query on solr example instance failed')
     s = load('http://localhost:8983/v2/cores')
-    if s.find('"responseHeader":{"status":0') == -1:
+    if s.find('"status":0,') == -1:
       print('FAILED: response is:\n%s' % s)
       raise RuntimeError('query api v2 on solr example instance failed')
   finally:


[2/2] lucene-solr:branch_7_0: SOLR-10494: fix smoker

Posted by ho...@apache.org.
SOLR-10494: fix smoker

(cherry picked from commit 56ad1a7a9b049e7399c0e482dcf6f4f395472f5b)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/25637fbb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/25637fbb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/25637fbb

Branch: refs/heads/branch_7_0
Commit: 25637fbba37e5c339562748e4bddcde31869ca2b
Parents: 477c218
Author: Chris Hostetter <ho...@apache.org>
Authored: Mon Jul 24 15:36:29 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Mon Jul 24 15:37:29 2017 -0700

----------------------------------------------------------------------
 dev-tools/scripts/smokeTestRelease.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/25637fbb/dev-tools/scripts/smokeTestRelease.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py
index 1083a09..01706a7 100644
--- a/dev-tools/scripts/smokeTestRelease.py
+++ b/dev-tools/scripts/smokeTestRelease.py
@@ -858,11 +858,11 @@ def testSolrExample(unpackPath, javaPath, isSrc):
     run('sh ./exampledocs/test_utf8.sh http://localhost:8983/solr/techproducts', 'utf8.log')
     print('      run query...')
     s = load('http://localhost:8983/solr/techproducts/select/?q=video')
-    if s.find('<result name="response" numFound="3" start="0">') == -1:
+    if s.find('"numFound":3,"start":0') == -1:
       print('FAILED: response is:\n%s' % s)
       raise RuntimeError('query on solr example instance failed')
     s = load('http://localhost:8983/v2/cores')
-    if s.find('"responseHeader":{"status":0') == -1:
+    if s.find('"status":0,') == -1:
       print('FAILED: response is:\n%s' % s)
       raise RuntimeError('query api v2 on solr example instance failed')
   finally: