Switch integration tmp to the system's temporary directory.

While running the tests within a VirtualBox(vagrant) machine, if the salt source is mounted using shared folders, any tests involving hard links WILL fail. Any tests involving symlinks, can be made to work by setting some properties on the VirtualBox shared folder. By moving the tests `tmp` directory to `tempfile.gettempdir()` we avoid this false test case errors.

tests/integration/__init__.py

@@ -9,6 +9,7 @@ import os
 import sys
 import shutil
 import subprocess
+import tempfile
 try:
     import pwd
 except ImportError:
@@ -31,7 +32,10 @@ SCRIPT_DIR = os.path.join(CODE_DIR, 'scripts')
 
 PYEXEC = 'python{0}.{1}'.format(sys.version_info[0], sys.version_info[1])
 
-TMP = os.path.join(INTEGRATION_TEST_DIR, 'tmp')
+TMP = os.path.join(tempfile.gettempdir(), 'salt-tests-tmpdir')
+if not os.path.isdir(TMP):
+    os.makedirs(TMP)
+
 FILES = os.path.join(INTEGRATION_TEST_DIR, 'files')
 MOCKBIN = os.path.join(INTEGRATION_TEST_DIR, 'mockbin')
 
@@ -217,16 +221,8 @@ class TestDaemon(object):
             shutil.rmtree(self.master_opts['root_dir'])
         if os.path.isdir(self.smaster_opts['root_dir']):
             shutil.rmtree(self.smaster_opts['root_dir'])
-        for fn_ in os.listdir(TMP):
-            if fn_ == '_README':
-                continue
-            path = os.path.join(TMP, fn_)
-            if os.path.isdir(path):
-                shutil.rmtree(path)
-            elif os.path.isfile(path):
-                os.remove(path)
-            elif os.path.islink(path):
-                os.remove(path)
+        if os.path.isdir(TMP):
+            shutil.rmtree(TMP)
 
 
 class ModuleCase(TestCase):
@@ -248,7 +244,7 @@ class ModuleCase(TestCase):
         '''
         know_to_return_none = ('file.chown', 'file.chgrp')
         orig = self.client.cmd(
-            minion_tgt, function, arg, timeout=100, kwarg=kwargs
+            minion_tgt, function, arg, timeout=500, kwarg=kwargs
         )
 
         if minion_tgt not in orig:
@@ -323,7 +319,7 @@ class SyndicCase(TestCase):
         Run a single salt function and condition the return down to match the
         behavior of the raw function call
         '''
-        orig = self.client.cmd('minion', function, arg)
+        orig = self.client.cmd('minion', function, arg, timeout=500)
         if 'minion' not in orig:
             self.skipTest(
                 'WARNING(SHOULD NOT HAPPEN #1935): Failed to get a reply '

tests/integration/tmp/_README

@@ -1,5 +0,0 @@
-=======
-TMP DIR
-=======
-The tmp dir is used to place files that need to be modified durring the
-execution of the test suite

tests/runtests.py

@@ -340,12 +340,11 @@ if __name__ == '__main__':
     overall_status.extend(status)
     false_count = overall_status.count(False)
 
-    if opts.coverage:
-        print('Stopping and saving coverage info')
-        code_coverage.stop()
-        code_coverage.save()
-
     if opts.no_report:
+        if opts.coverage:
+            code_coverage.stop()
+            code_coverage.save()
+
         if false_count > 0:
             sys.exit(1)
         else:
@@ -399,8 +398,11 @@ if __name__ == '__main__':
     print_header('  Overall Tests Report  ', sep='=', centered=True, inline=True)
 
     if opts.coverage:
-        report_dir = os.path.join(os.path.dirname(__file__), 'coverage-report')
+        print('Stopping and saving coverage info')
+        code_coverage.stop()
+        code_coverage.save()
 
+        report_dir = os.path.join(os.path.dirname(__file__), 'coverage-report')
         print(
             '\nGenerating Coverage HTML Report Under {0!r} ...'.format(
                 report_dir