Merge lp:~abreu-alexandre/click-reviewers-tools/fix-local-url-patterns-override-rule into lp:click-reviewers-tools

[Alexandre Abreu]

Relax the rule that states that webapps with a model search path shouldn't have url patterns listed in the command line. In order to avoid confusion, we allow this to happen (and it already works fine the command line patterns being appended to the locally defined ones).

Relax the rule that states that webapps with a model search path shouldn't have url patterns listed in the command line. In order to avoid confusion, we allow this to happen (and it already works fine the command line patterns being appended to the locally defined ones).

[Jamie Strandboge (jdstrand)]

Since --webappUrlPatterns is now supposed to work with a model search path as per Alex's comments, this looks ok to me.

review: Approve

[Daniel Holbach (dholbach)]

Looks like this wasn't merged yet.

=== modified file 'clickreviews/cr_desktop.py'
--- clickreviews/cr_desktop.py	2014-12-04 23:10:47 +0000
+++ clickreviews/cr_desktop.py	2015-02-02 16:02:22 +0000
@@ -340,11 +340,7 @@
                         "--webappModelSearchPath or --webapp= when " + \
                         "running local application"
             elif not is_launching_local_app:
-                if found_url_patterns and found_model_search_path:
-                    t = 'error'
-                    s = "should not specify --webappUrlPatterns when using " + \
-                        "--webappModelSearchPath"
-                elif not found_url_patterns and not found_model_search_path:
+                if not found_url_patterns and not found_model_search_path:
                     t = 'error'
                     s = "must specify one of --webappUrlPatterns or " + \
                         "--webappModelSearchPath"

=== modified file 'clickreviews/tests/test_cr_desktop.py'
--- clickreviews/tests/test_cr_desktop.py	2014-11-21 18:41:24 +0000
+++ clickreviews/tests/test_cr_desktop.py	2015-02-02 16:02:22 +0000
@@ -224,7 +224,7 @@
                                   ex)
             c.check_desktop_exec_webapp_args()
             r = c.click_report
-            expected_counts = {'info': None, 'warn': 0, 'error': 1}
+            expected_counts = {'info': None, 'warn': 0, 'error': 0}
             self.check_results(r, expected_counts)
 
     def test_check_desktop_exec_webbrowser_missing_exec(self):