5OUPCfOUHxEG4HBB0qU7r9 changeset

Changeset386432646161 (b)
ParentNone (a)
ab
0+diff --git a/pytests/viewtests.py b/pytests/viewtests.py
0+index 7164907..e8cb215 100644
0+--- a/pytests/viewtests.py
0++++ b/pytests/viewtests.py
0+@@ -251,10 +251,10 @@ class ViewTests(unittest.TestCase):
0+             moxi.set(key, 0, 0, json.dumps(value))
0+         self.log.info("inserted {0} json documents".format(num_of_docs))
0+         #        self._verify_views_replicated(bucket, view_name, map_fn)
0+-        results = self._get_view_results(rest, bucket, view_name, num_of_docs)
0++        results = self._get_view_results(rest, bucket, view_name, num_of_docs, extra_params={"stale": False})
0+         value = self._get_built_in_reduce_results(results)
0+         results_without_reduce = self._get_view_results(rest, bucket, view_name, num_of_docs,
0+-                                                        extra_params={"reduce": False})
0++                                                        extra_params={"reduce": False, "stale": False})
0+         #TODO: we should extend this function to wait for disk_write_queue for all nodes
0+         RebalanceHelper.wait_for_stats(master, bucket, 'ep_queue_size', 0)
0+         # try this for maximum 3 minutes
0+@@ -269,12 +269,12 @@ class ViewTests(unittest.TestCase):
0+             attempt += 1
0+             #get the results without reduce ?
0+             results_without_reduce = self._get_view_results(rest, bucket, view_name, num_of_docs,
0+-                                                            extra_params={"reduce": False})
0++                                                            extra_params={"reduce": False, "stale": False})
0+             keys = self._get_keys(results_without_reduce)
0+             num_of_results_without_reduce = len(keys)
0+             msg = "view with reduce=false returned {0} items, expected to return {1} items"
0+             self.log.info(msg.format(len(keys), len(doc_names)))
0+-            results = self._get_view_results(rest, bucket, view_name, num_of_docs)
0++            results = self._get_view_results(rest, bucket, view_name, num_of_docs, extra_params={"stale": False})
0+             value = self._get_built_in_reduce_results(results)
0+             msg = "reduce returned {0}, expected to return {1}"
0+             self.log.info(msg.format(value, len(doc_names)))
...
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
--- Revision None
+++ Revision 386432646161
@@ -0,0 +1,32 @@
+diff --git a/pytests/viewtests.py b/pytests/viewtests.py
+index 7164907..e8cb215 100644
+--- a/pytests/viewtests.py
++++ b/pytests/viewtests.py
+@@ -251,10 +251,10 @@ class ViewTests(unittest.TestCase):
+ moxi.set(key, 0, 0, json.dumps(value))
+ self.log.info("inserted {0} json documents".format(num_of_docs))
+ # self._verify_views_replicated(bucket, view_name, map_fn)
+- results = self._get_view_results(rest, bucket, view_name, num_of_docs)
++ results = self._get_view_results(rest, bucket, view_name, num_of_docs, extra_params={"stale": False})
+ value = self._get_built_in_reduce_results(results)
+ results_without_reduce = self._get_view_results(rest, bucket, view_name, num_of_docs,
+- extra_params={"reduce": False})
++ extra_params={"reduce": False, "stale": False})
+ #TODO: we should extend this function to wait for disk_write_queue for all nodes
+ RebalanceHelper.wait_for_stats(master, bucket, 'ep_queue_size', 0)
+ # try this for maximum 3 minutes
+@@ -269,12 +269,12 @@ class ViewTests(unittest.TestCase):
+ attempt += 1
+ #get the results without reduce ?
+ results_without_reduce = self._get_view_results(rest, bucket, view_name, num_of_docs,
+- extra_params={"reduce": False})
++ extra_params={"reduce": False, "stale": False})
+ keys = self._get_keys(results_without_reduce)
+ num_of_results_without_reduce = len(keys)
+ msg = "view with reduce=false returned {0} items, expected to return {1} items"
+ self.log.info(msg.format(len(keys), len(doc_names)))
+- results = self._get_view_results(rest, bucket, view_name, num_of_docs)
++ results = self._get_view_results(rest, bucket, view_name, num_of_docs, extra_params={"stale": False})
+ value = self._get_built_in_reduce_results(results)
+ msg = "reduce returned {0}, expected to return {1}"
+ self.log.info(msg.format(value, len(doc_names)))