Merge lp:~noise/ubuntu-rest-scopes/fix-avoidable-query into lp:ubuntu-rest-scopes

[Bret Barker]

fix off-by-one error in avoidable query check; fix typo in constant

[Roberto Alsina (ralsina)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~noise/ubuntu-rest-scopes/fix-avoidable-query into lp:ubuntu-rest-scopes failed. Below is the output from the failed tests.

src/tests/test_utils.py:77:1: W293 blank line contains whitespace

......................................................................................................................................................................................................................................................................................................................................................................
----------------------------------------------------------------------
Ran 358 tests in 15.698s

OK

[lp:~noise/ubuntu-rest-scopes/fix-avoidable-query]

447. By Bret Barker on 2015-04-08

pep8 foo

=== modified file 'src/tests/test_utils.py'
--- src/tests/test_utils.py	2015-03-31 15:03:35 +0000
+++ src/tests/test_utils.py	2015-04-08 19:58:47 +0000
@@ -70,3 +70,21 @@
     def test_too_repeated_twice(self):
         q = u"adjskajhxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxmb,mb,mb,mb,hkkkkkkkkkkkkkkkkkkkkkkkkkpouiud"
         self.assertTrue(utils.avoidable_query(q))
+
+    def test_simple_repeated_5(self):
+        q = u"x" * utils.MAX_REPEATED_IN_A_ROW
+        self.assertFalse(utils.avoidable_query(q))
+
+    def test_simple_repeated_6(self):
+        q = u"x" * (utils.MAX_REPEATED_IN_A_ROW + 1)
+        self.assertTrue(utils.avoidable_query(q))
+
+    def test_simple_repeated_7(self):
+        q = u"x" * (utils.MAX_REPEATED_IN_A_ROW + 2)
+        self.assertTrue(utils.avoidable_query(q))
+
+    def test_simple_repeated_again(self):
+        q = u"x" * utils.MAX_REPEATED_IN_A_ROW
+        q += u"yz"
+        q += u"x" * (utils.MAX_REPEATED_IN_A_ROW + 1)
+        self.assertTrue(utils.avoidable_query(q))

=== modified file 'src/utils.py'
--- src/utils.py	2015-03-31 15:03:35 +0000
+++ src/utils.py	2015-04-08 19:58:47 +0000
@@ -19,7 +19,7 @@
 
 # limits for the avoidable query function
 MAX_QUERY_LENGTH = 100
-MAX_REPETEAD_IN_A_ROW = 5
+MAX_REPEATED_IN_A_ROW = 5
 
 
 def full_icon_url(name):
@@ -82,13 +82,14 @@
         return True
 
     # detect a "lot of same letter in the row"
-    cnt = 0
+    cnt = 1
     prev = None
     for char in query:
         if char == prev:
             cnt += 1
-            if cnt > MAX_REPETEAD_IN_A_ROW:
+            if cnt > MAX_REPEATED_IN_A_ROW:
                 return True
         else:
-            cnt = 0
+            cnt = 1
             prev = char
+    return False