Browse Source

Merge "add python 3.6 unit test job"

Zuul 7 months ago
parent
commit
87c268ce5f

+ 1
- 0
.zuul.yaml View File

@@ -96,6 +96,7 @@
96 96
     templates:
97 97
       - openstack-python-jobs
98 98
       - openstack-python35-jobs
99
+      - openstack-python36-jobs
99 100
       - release-notes-jobs-python3
100 101
       - publish-openstack-docs-pti
101 102
       - check-requirements

+ 3
- 3
kuryr_libnetwork/tests/fullstack/test_ipam.py View File

@@ -178,9 +178,9 @@ class IpamTest(kuryr_base.KuryrBaseTest):
178 178
             "Options": {},
179 179
             "Config": [
180 180
                 {
181
-                    "Subnet": "10.15.0.0/16",
182
-                    "IPRange": "10.15.0.0/24",
183
-                    "Gateway": "10.15.0.1"
181
+                    "Subnet": "10.13.0.0/16",
182
+                    "IPRange": "10.13.0.0/24",
183
+                    "Gateway": "10.13.0.1"
184 184
                 }
185 185
             ]
186 186
         }

+ 3
- 4
kuryr_libnetwork/tests/unit/test_config.py View File

@@ -47,16 +47,15 @@ class ConfigurationTest(base.TestKuryrBase):
47 47
         self.assertEqual('kuryr_libnetwork.port_driver.drivers.veth',
48 48
                          config.CONF.port_driver)
49 49
 
50
-    @mock.patch.object(sys, 'argv', return_value='[]')
51 50
     @mock.patch('kuryr_libnetwork.controllers.check_for_neutron_tag_support')
52 51
     @mock.patch('kuryr_libnetwork.controllers.check_for_neutron_ext_support')
53 52
     @mock.patch('kuryr_libnetwork.controllers.neutron_client')
54 53
     @mock.patch('kuryr_libnetwork.app.run')
55 54
     def test_start(self, mock_run, mock_neutron_client,
56 55
                    mock_check_neutron_ext_support,
57
-                   mock_check_for_neutron_tag_support,
58
-                   mock_sys_argv):
59
-        start()
56
+                   mock_check_for_neutron_tag_support):
57
+        with mock.patch.object(sys, 'argv', ['prog']):
58
+            start()
60 59
         kuryr_uri = parse.urlparse(config.CONF.kuryr_uri)
61 60
         mock_neutron_client.assert_called_once()
62 61
         mock_check_neutron_ext_support.assert_called_once()

Loading…
Cancel
Save