Merge pull request #34618 from jtand/network_integration_fix

Network state integration test test=True
saltstack · Jul 13, 2016 · 3e612c3 · 3e612c3
2 parents 9f12354 + 34bcf9c
commit 3e612c3
Showing 1 changed file with 8 additions and 29 deletions.
diff --git a/tests/integration/states/network.py b/tests/integration/states/network.py
@@ -27,55 +27,34 @@ def setUp(self):
         if os_family not in ('RedHat', 'Debian'):
             self.skipTest('Network state only supported on RedHat and Debian based systems')
 
-        self.run_function('cmd.run', ['ip link add name dummy0 type dummy'])
-
-    def tearDown(self):
-        self.run_function('cmd.run', ['ip link delete dev dummy0'])
-
     def test_managed(self):
         '''
         network.managed
         '''
-        if_name = 'dummy0'
-        ipaddr = '10.1.0.1'
-        netmask = '255.255.255.0'
-        broadcast = '10.1.0.255'
-
-        expected_if_ret = [{
-                    "broadcast": broadcast,
-                    "netmask": netmask,
-                    "label": if_name,
-                    "address": ipaddr
-                }]
+        state_key = 'network_|-dummy0_|-dummy0_|-managed'
 
-        ret = self.run_function('state.sls', mods='network.managed')
-        self.assertSaltTrueReturn(ret)
-
-        interface = self.run_function('network.interface', [if_name])
-        self.assertEqual(interface, expected_if_ret)
+        ret = self.run_function('state.sls', mods='network.managed', test=True)
+        self.assertEqual('Interface dummy0 is set to be added.', ret[state_key]['comment'])
 
     def test_routes(self):
         '''
         network.routes
         '''
         state_key = 'network_|-routes_|-dummy0_|-routes'
-        expected_changes = {'network_routes': 'Added interface dummy0 routes.'}
+        expected_changes = 'Interface dummy0 routes are set to be added.'
 
-        ret = self.run_function('state.sls', mods='network.routes')
+        ret = self.run_function('state.sls', mods='network.routes', test=True)
 
-        self.assertSaltTrueReturn(ret)
-        self.assertEqual(ret[state_key]['changes'], expected_changes)
+        self.assertEqual(ret[state_key]['comment'], 'Interface dummy0 routes are set to be added.')
 
     def test_system(self):
         '''
         network.system
         '''
         state_key = 'network_|-system_|-system_|-system'
 
-        ret = self.run_function('state.sls', mods='network.system')
-
-        self.assertSaltTrueReturn(ret)
-        self.assertIn('network_settings', ret[state_key]['changes'])
+        ret = self.run_function('state.sls', mods='network.system', test=True)
+        self.assertIn('Global network settings are set to be updated:', ret[state_key]['comment'])
 
 
 if __name__ == '__main__':