← Back to branch summary

~ubuntu-branches/ubuntu/utopic/horizon/utopic-updates

« back to all changes in this revision

Viewing changes to horizon/test/tests/utils.py

  • Committer: Package Import Robot
  • Author(s): James Page, Chris Johnston, James Page
  • Date: 2014-10-03 17:54:18 UTC
  • mfrom: (0.4.1) (1.1.44) (70.1.2 utopic)
  • Revision ID: package-import@ubuntu.com-20141003175418-1jomx0azdvnl5fxz
Tags: 1:2014.2~rc1-0ubuntu1
https://launchpad.net/bugs/1308651
[ Chris Johnston ]
* d/theme/css/ubuntu.css: Fix Ubuntu theme for Instances "more" dropdown
  (LP: #1308651).

[ James Page ]
* New upstream release candidate:
  - d/p/*: Refresh.
* d/watch: Use tarballs.openstack.org for upstream releases. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
horizon/test/tests/utils.py
79
79
                     "1.2.3.4:1111:2222::5555//22",
80
80
                     "fe80::204:61ff:254.157.241.86/200",
81
81
                     # some valid IPv4 addresses
82
 
                      "10.144.11.107/4",
83
 
                      "255.255.255.255/0",
84
 
                      "0.1.2.3/16")
 
82
                     "10.144.11.107/4",
 
83
                     "255.255.255.255/0",
 
84
                     "0.1.2.3/16")
85
85
        ip = forms.IPField(mask=True, version=forms.IPv6)
86
86
        for cidr in GOOD_CIDRS:
87
87
            self.assertIsNone(ip.validate(cidr))
149
149
        ipv4 = forms.IPField(required=True, version=forms.IPv4)
150
150
        ipv6 = forms.IPField(required=False, version=forms.IPv6)
151
151
        ipmixed = forms.IPField(required=False,
152
 
                                 version=forms.IPv4 | forms.IPv6)
 
152
                                version=forms.IPv4 | forms.IPv6)
153
153
 
154
154
        for ip_addr in GOOD_IPS_V4:
155
155
            self.assertIsNone(ipv4.validate(ip_addr))
170
170
        self.assertRaises(ValidationError, ipv4.validate, "")  # required=True
171
171
 
172
172
        iprange = forms.IPField(required=False,
173
 
                                 mask=True,
174
 
                                 mask_range_from=10,
175
 
                                 version=forms.IPv4 | forms.IPv6)
 
173
                                mask=True,
 
174
                                mask_range_from=10,
 
175
                                version=forms.IPv4 | forms.IPv6)
176
176
        self.assertRaises(ValidationError, iprange.validate,
177
177
                          "fe80::204:61ff:254.157.241.86/6")
178
178
        self.assertRaises(ValidationError, iprange.validate,