[Pkg-mozext-commits] [requestpolicy] 67/257: [tst][imp] rules.py: convert port numbers to integer

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit c1860f2e5e4a1f289ddd6b1c8c5d6983cd14d0f8
Author: Martin Kimmerle <dev at 256k.de>
Date:   Tue Oct 6 01:28:15 2015 +0200

    [tst][imp] rules.py: convert port numbers to integer
---
 tests/marionette/rp_puppeteer/api/rules.py        | 12 +++++++++++-
 tests/marionette/rp_puppeteer/tests/test_rules.py |  6 ++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/tests/marionette/rp_puppeteer/api/rules.py b/tests/marionette/rp_puppeteer/api/rules.py
index 5d1b9dd..d892e9d 100644
--- a/tests/marionette/rp_puppeteer/api/rules.py
+++ b/tests/marionette/rp_puppeteer/api/rules.py
@@ -3,6 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from firefox_puppeteer.base import BaseLib
+import copy
 
 
 class Rules(BaseLib):
@@ -118,7 +119,7 @@ class Rule(BaseLib):
 
     def __init__(self, marionette_getter, rule_data, allow, temp):
         super(Rule, self).__init__(marionette_getter)
-        self.rule_data = rule_data
+        self._set_rule_data(rule_data)
         self.allow = allow
         self.temp = temp
 
@@ -221,3 +222,12 @@ class Rule(BaseLib):
         if first in self.rule_data and second in self.rule_data[first]:
             return self.rule_data[first][second]
         return None
+
+    def _set_rule_data(self, new_rule_data):
+        rule_data = copy.deepcopy(new_rule_data)
+        # Convert port numbers to integer
+        if "o" in rule_data and "port" in rule_data["o"]:
+            rule_data["o"]["port"] = int(rule_data["o"]["port"])
+        if "d" in rule_data and "port" in rule_data["d"]:
+            rule_data["d"]["port"] = int(rule_data["d"]["port"])
+        self.rule_data = rule_data
diff --git a/tests/marionette/rp_puppeteer/tests/test_rules.py b/tests/marionette/rp_puppeteer/tests/test_rules.py
index d546862..248071e 100644
--- a/tests/marionette/rp_puppeteer/tests/test_rules.py
+++ b/tests/marionette/rp_puppeteer/tests/test_rules.py
@@ -172,6 +172,12 @@ class TestRules(RulesTestCase):
 
 class TestRule(RulesTestCase):
 
+    def test_string_port(self):
+        # The port needs to be converted to integer.
+        string_port_rule = Rule(lambda: self.marionette, {"o": {"port": "80"}},
+                                allow=False, temp=False)
+        self.assertEqual(string_port_rule.origin_port, 80)
+
     def test_eq_and_ne_rich_comparisons(self):
         # Test that `Rule` has both the __eq__ and the __ne__ method
         self.assertIn("__eq__", dir(Rule))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git