Fixing the mismatched fts query tests due to random data loading but checking the fixed expected results. Girish and I had debugged this.There are lot of differences in the random.py from Python2 vs. Python3 and it looks like not possible to match exact to 2.7. I think we have 2 options. 1) Change the test case design not to rely on the random data load with fixed expected from randomness. Or 2) Update the conf files with Py3 results. For now, I am going to update couchbase#2. Later Girish can think of couchbase#1.

Author: jdmuntacb

conf/fts/py-fts-querytime-tests.conf

@@ -28,29 +28,29 @@ fts.stable_topology_fts.StableTopFTS:
 
     # --- Sorting testcases ---
     # Sorting on fields of different data types, ascending and descending
-    test_sorting_of_results,items=100,sort_fields=dept,expected=emp10000042,emp10000001,emp10000071,tolerance=emp10000001,emp10000071,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=-dept,expected=emp10000071,emp10000001,emp10000042,tolerance=emp10000001,emp10000071,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=-salary,expected=emp10000071,emp10000001,emp10000042,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=salary,expected=emp10000042,emp10000001,emp10000071,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=join_date,expected=emp10000001,emp10000071,emp10000042,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=-join_date,expected=emp10000042,emp10000071,emp10000001,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=-is_manager,expected=emp10000071,emp10000042,emp10000001,tolerance=emp10000042,emp10000071,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=is_manager,expected=emp10000001,emp10000042,emp10000071,tolerance=emp10000042,emp10000071,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=_id,expected=emp10000001,emp10000042,emp10000071,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=-_id,expected=emp10000071,emp10000042,emp10000001,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=_score,expected=emp10000042,emp10000071,emp10000001,tolerance=emp10000042,emp10000071,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=-_score,expected=emp10000001,emp10000071,emp10000042,tolerance=emp10000042,emp10000071,cluster=D,D+F,F
-    test_sorting_of_results_during_indexing,items=100000,sort_fields=dept,expected=emp10000042,emp10000001,emp10000071,tolerance=emp10000001,emp10000071,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=dept,expected=emp10000062,emp10000001,tolerance=emp10000001,emp10000062,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=-dept,expected=emp10000062,emp10000001,tolerance=emp10000001,emp10000062,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=-salary,expected=emp10000062,emp10000001,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=salary,expected=emp10000062,emp10000001,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=join_date,expected=emp10000001,emp10000062,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=-join_date,expected=emp10000062,emp10000001,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=-is_manager,expected=emp10000062,emp10000001,tolerance=emp10000001,emp10000062,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=is_manager,expected=emp10000001,emp10000062,tolerance=emp10000062,emp10000001,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=_id,expected=emp10000001,emp10000062,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=-_id,expected=emp10000062,emp10000001,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=_score,expected=emp10000062,emp10000001,tolerance=emp10000062,emp10000001,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=-_score,expected=emp10000001,emp10000062,tolerance=emp10000062,emp10000001,cluster=D,D+F,F
+    test_sorting_of_results_during_indexing,items=100000,sort_fields=dept,expected=emp10000062,emp10000001,tolerance=emp10000001,emp10000062,cluster=D,D+F,F
 
     # Sorting when no fields are specified - default sort field is -_score
-    test_sorting_of_results,items=100,sort_fields=,expected=emp10000001,emp10000071,emp10000042,tolerance=emp10000042,emp10000071,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=,expected=emp10000001,emp10000062,tolerance=emp10000062,cluster=D,D+F,F
 
     # Sorting with multiple fields in different orders
-    test_sorting_of_results,items=100,sort_fields=is_manager,salary,expected=emp10000001,emp10000042,emp10000071,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=-is_manager,salary,expected=emp10000042,emp10000071,emp10000001,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=-is_manager,-salary,expected=emp10000071,emp10000042,emp10000001,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=is_manager,-salary,expected=emp10000001,emp10000071,emp10000042,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=-is_manager,salary,dept,languages_known,join_date,_id_score,expected=emp10000042,emp10000071,emp10000001,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=is_manager,salary,expected=emp10000001,emp10000062,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=-is_manager,salary,expected=emp10000062,emp10000001,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=-is_manager,-salary,expected=emp10000062,emp10000001,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=is_manager,-salary,expected=emp10000001,emp10000062,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=-is_manager,salary,dept,languages_known,join_date,_id_score,expected=emp10000062,emp10000001,cluster=D,D+F,F
 
     # Sorting based on an invalid field name
     test_sorting_of_results,items=100,sort_fields=invalid,cluster=D,D+F,F
@@ -64,14 +64,14 @@ fts.stable_topology_fts.StableTopFTS:
     test_sorting_of_results_on_non_indexed_fields,items=100,sort_fields=join_date,cluster=D,D+F,F
 
     # Advanced sorting using sorting params
-    test_sorting_of_results,items=100,sort_fields=languages_known,advanced_sort=True,sort_by=field,sort_missing=first,sort_desc=False,sort_mode=max,expected=emp10000001,emp10000042,emp10000071,tolerance=emp10000042,emp10000001,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=languages_known,advanced_sort=True,sort_by=field,sort_missing=first,sort_desc=False,sort_mode=min,expected=emp10000001,emp10000071,emp10000042,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=languages_known,advanced_sort=True,sort_by=field,sort_missing=first,sort_desc=True,sort_mode=min,expected=emp10000042,emp10000071,emp10000001,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=languages_known,salary,advanced_sort=True,sort_by=field,sort_missing=first,sort_desc=False,sort_mode=max,expected=emp10000042,emp10000001,emp10000071,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=_id,advanced_sort=True,sort_by=id,sort_missing=first,sort_desc=False,sort_mode=min,expected=emp10000001,emp10000042,emp10000071,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=_score,advanced_sort=True,sort_missing=first,sort_desc=False,sort_mode=min,expected=emp10000042,emp10000071,emp10000001,tolerance=emp10000042,emp10000071,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=manages.team_size,advanced_sort=True,sort_by=field,sort_missing=first,sort_desc=False,sort_mode=max,expected=emp10000001,emp10000042,emp10000071,cluster=D,D+F,F
-    test_sorting_of_results,items=100,sort_fields=manages.team_size,advanced_sort=True,sort_by=field,sort_missing=last,sort_desc=False,sort_mode=max,expected=emp10000042,emp10000071,emp10000001,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=languages_known,advanced_sort=True,sort_by=field,sort_missing=first,sort_desc=False,sort_mode=max,expected=emp10000001,emp10000062,tolerance=emp10000062,emp10000001,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=languages_known,advanced_sort=True,sort_by=field,sort_missing=first,sort_desc=False,sort_mode=min,expected=emp10000001,emp10000062,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=languages_known,advanced_sort=True,sort_by=field,sort_missing=first,sort_desc=True,sort_mode=min,expected=emp10000062,emp10000001,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=languages_known,salary,advanced_sort=True,sort_by=field,sort_missing=first,sort_desc=False,sort_mode=max,expected=emp10000062,emp10000001,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=_id,advanced_sort=True,sort_by=id,sort_missing=first,sort_desc=False,sort_mode=min,expected=emp10000001,emp10000062,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=_score,advanced_sort=True,sort_missing=first,sort_desc=False,sort_mode=min,expected=emp10000062,emp10000001,tolerance=emp10000001,emp10000062,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=manages.team_size,advanced_sort=True,sort_by=field,sort_missing=first,sort_desc=False,sort_mode=max,expected=emp10000001,emp10000062,cluster=D,D+F,F
+    test_sorting_of_results,items=100,sort_fields=manages.team_size,advanced_sort=True,sort_by=field,sort_missing=last,sort_desc=False,sort_mode=max,expected=emp10000062,emp10000001,cluster=D,D+F,F
 
     # Scoring testcases (should run on a single node)
     test_scoring_tf_score,max_partitions_pindex=1024,query="""{"query": "cat"}""",expected_hits=3,GROUP=P0,cluster=D,D+F
@@ -115,13 +115,13 @@ fts.stable_topology_fts.StableTopFTS:
     test_snippets_highlighting_of_search_term_in_results,query="""{"query": "Palmer"}""",expected_results=[{"doc_id":"emp10000001","field_name":"name","term":"Palmer"},{"doc_id":"emp10000009","field_name":"manages.reports","term":"Palmer"}],highlight_style=ansi,items=10,cluster=D,D+F,D+F
     test_snippets_highlighting_of_search_term_in_results,highlight_fields=name,manages.reports,query="""{"query": "Palmer"}""",expected_results=[{"doc_id":"emp10000001","field_name":"name","term":"Palmer"},{"doc_id":"emp10000009","field_name":"manages.reports","term":"Palmer"}],highlight_style=ansi,items=10,cluster=D,D+F,D+F
     test_snippets_highlighting_of_search_term_in_results,highlight_fields=name,query="""{"query": "Palmer"}""",expected_results=[{"doc_id":"emp10000001","field_name":"name","term":"Palmer"}],highlight_style=ansi,items=10,cluster=D,D+F,D+F
-    test_snippets_highlighting_of_search_term_in_results,highlight_fields=manages.reports,query="""{"query": "Palmer"}""",expected_results=[{"doc_id":"emp10000009","field_name":"manages.reports","term":"Palmer"}],highlight_style=ansi,items=10,cluster=D,D+F,D+F
-    test_snippets_highlighting_of_search_term_in_results,negative_test=True,highlight_fields=name,query="""{"query": "Palmer"}""",expected_results=[{"doc_id":"emp10000009","field_name":"manages.reports","term":"Palmer"}],highlight_style=ansi,items=10,cluster=D,D+F,D+F
+    test_snippets_highlighting_of_search_term_in_results,highlight_fields=manages.reports,query="""{"query": "Palmer"}""",expected_results=[{"doc_id":"emp10000010","field_name":"manages.reports","term":"Palmer"}],highlight_style=ansi,items=10,cluster=D,D+F,D+F
+    test_snippets_highlighting_of_search_term_in_results,negative_test=True,highlight_fields=name,query="""{"query": "Palmer"}""",expected_results=[{"doc_id":"emp10000010","field_name":"manages.reports","term":"Palmer"}],highlight_style=ansi,items=10,cluster=D,D+F,D+F
     test_snippets_highlighting_of_search_term_in_results,query="""{"field":"name", "term": "Sofiya", "fuzziness":2}""",highlight_style=ansi,items=10,expected_results=[{"doc_id":"emp10000001","field_name":"name","term":"Safiya"}],cluster=D,D+F,D+F
 
     # Tests for Score=none
-    test_score_none,items=1000,expected_hits=12,cluster=D,D+F
-    test_score_none,items=1000,expected_hits=12,cluster=D,D+F,D+F
+    test_score_none,items=1000,expected_hits=16,cluster=D,D+F
+    test_score_none,items=1000,expected_hits=16,cluster=D,D+F,D+F
     test_result_correctness_score_none,items=10000,cluster=D,D+F
     test_result_correctness_score_none,items=10000,cluster=D,D+F,F