Merge branch 'develop' into proxmox-cloud-modify-clone

saltstack · Aug 23, 2018 · 8352ace · 8352ace
2 parents e531049 + 09e4978
commit 8352ace
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 29 deletions.
diff --git a/tests/integration/sdb/test_vault.py b/tests/integration/sdb/test_vault.py
@@ -5,6 +5,8 @@
 
 # Import Python Libs
 from __future__ import absolute_import, print_function, unicode_literals
+import inspect
+import time
 
 # Import Salt Testing Libs
 from tests.support.unit import skipIf
@@ -23,37 +25,54 @@ class VaultTestCase(ModuleCase, ShellCase):
     '''
     Test vault module
     '''
+    count = 0
+
     def setUp(self):
         '''
+        SetUp vault container
         '''
-        config = '{"backend": {"file": {"path": "/vault/file"}}, "default_lease_ttl": "168h", "max_lease_ttl": "720h"}'
-        self.run_state('docker_image.present', name='vault', tag='0.9.6')
-        self.run_state(
-            'docker_container.running',
-            name='vault',
-            image='vault:0.9.6',
-            port_bindings='8200:8200',
-            environment={
-                'VAULT_DEV_ROOT_TOKEN_ID': 'testsecret',
-                'VAULT_LOCAL_CONFIG': config,
-            },
-            cap_add='IPC_LOCK',
-        )
-        self.run_function(
-            'cmd.run',
-            cmd='/usr/local/bin/vault login token=testsecret',
-            env={'VAULT_ADDR': 'http://127.0.0.1:8200'},
-        )
-        self.run_function(
-            'cmd.run',
-            cmd='/usr/local/bin/vault policy write testpolicy {0}/vault.hcl'.format(FILES),
-            env={'VAULT_ADDR': 'http://127.0.0.1:8200'},
-        )
+        if self.count == 0:
+            config = '{"backend": {"file": {"path": "/vault/file"}}, "default_lease_ttl": "168h", "max_lease_ttl": "720h"}'
+            self.run_state('docker_image.present', name='vault', tag='0.9.6')
+            self.run_state(
+                'docker_container.running',
+                name='vault',
+                image='vault:0.9.6',
+                port_bindings='8200:8200',
+                environment={
+                    'VAULT_DEV_ROOT_TOKEN_ID': 'testsecret',
+                    'VAULT_LOCAL_CONFIG': config,
+                },
+                cap_add='IPC_LOCK',
+            )
+            time.sleep(5)
+            ret = self.run_function(
+                'cmd.retcode',
+                cmd='/usr/local/bin/vault login token=testsecret',
+                env={'VAULT_ADDR': 'http://127.0.0.1:8200'},
+            )
+            if ret != 0:
+                self.skipTest('unable to login to vault')
+            ret = self.run_function(
+                'cmd.retcode',
+                cmd='/usr/local/bin/vault policy write testpolicy {0}/vault.hcl'.format(FILES),
+                env={'VAULT_ADDR': 'http://127.0.0.1:8200'},
+            )
+            if ret != 0:
+                self.skipTest('unable to assign policy to vault')
+        self.count += 1
 
     def tearDown(self):
-        self.run_state('docker_container.stopped', name='vault')
-        self.run_state('docker_container.absent', name='vault')
-        self.run_state('docker_image.absent', name='vault', force=True)
+        '''
+        TearDown vault container
+        '''
+        def count_tests(funcobj):
+            return inspect.ismethod(funcobj) and funcobj.__name__.startswith('test_')
+        numtests = len(inspect.getmembers(VaultTestCase, predicate=count_tests))
+        if self.count >= numtests:
+            self.run_state('docker_container.stopped', name='vault')
+            self.run_state('docker_container.absent', name='vault')
+            self.run_state('docker_image.absent', name='vault', force=True)
 
     @flaky
     def test_sdb(self):

diff --git a/tests/whitelist.txt b/tests/whitelist.txt
@@ -4,21 +4,21 @@ integration.grains.test_core
 integration.loader.test_ext_grains
 integration.loader.test_ext_modules
 integration.modules.test_aliases
-integration.modules.test_autoruns
+integration.modules.test_win_autoruns
 integration.modules.test_beacons
 integration.modules.test_config
 integration.modules.test_cp
 integration.modules.test_cmdmod
 integration.modules.test_data
 integration.modules.test_disk
-integration.modules.test_firewall
+integration.modules.test_win_firewall
 integration.modules.test_git
 integration.modules.test_grains
 integration.modules.test_groupadd
 integration.modules.test_hosts
 integration.modules.test_mine
 integration.modules.test_network
-integration.modules.test_ntp
+integration.modules.test_win_ntp
 integration.modules.test_pillar
 integration.modules.test_pip
 integration.modules.test_pkg