AMBARI-6064. Server unittests should remove temporary files (aonishuk)

ambari-server/src/test/python/TestAmbariServer.py

@@ -24,6 +24,7 @@ from mock.mock import patch
 from mock.mock import MagicMock
 from mock.mock import create_autospec
 import os, errno, tempfile
+import glob
 import signal
 import stat
 import datetime
@@ -3567,6 +3568,8 @@ MIIFHjCCAwYCCQDpHKOBI+Lt0zANBgkqhkiG9w0BAQUFADBRMQswCQYDVQQGEwJV
     self.assertEquals(result, 0)
 
     os.unlink(fn2)
+    os.unlink(ambari_server.AMBARI_PROPERTIES_RPMSAVE_FILE
+              + '.' + timestamp.strftime('%Y%m%d%H%M%S'))
 
     #if ambari.properties file is absent then "ambari-server upgrade" should
     # fail
@@ -3575,6 +3578,8 @@ MIIFHjCCAwYCCQDpHKOBI+Lt0zANBgkqhkiG9w0BAQUFADBRMQswCQYDVQQGEwJV
 
     result = ambari_server.update_ambari_properties()
     self.assertNotEquals(result, 0)
+    os.unlink(os.path.join(tempfile.gettempdir(),'password.dat'))
+    os.unlink(fn)
 
   @patch.object(ambari_server.Properties, '__init__')
   @patch.object(ambari_server, 'search_file')
@@ -3628,6 +3633,8 @@ MIIFHjCCAwYCCQDpHKOBI+Lt0zANBgkqhkiG9w0BAQUFADBRMQswCQYDVQQGEwJV
     self.assertEqual(value, "root")
 
     os.unlink(fn2)
+    prev_conf_file = glob.glob(ambari_server.AMBARI_PROPERTIES_RPMSAVE_FILE+'*')
+    os.unlink(prev_conf_file[0])
 
 
   @patch.object(ambari_server, 'verify_setup_allowed')

ambari-server/src/test/python/TestOSCheck.py

@@ -21,6 +21,7 @@ limitations under the License.
 import platform
 import datetime
 import os
+import glob
 import errno
 import tempfile
 import sys
@@ -211,6 +212,9 @@ class TestOSCheck(TestCase):
     # Command should not fail if *.rpmsave file is missing
     result = ambari_server.update_ambari_properties()
     self.assertEquals(result, 0)
+    os.unlink(fn2)
+    prev_conf_file = glob.glob(ambari_server.AMBARI_PROPERTIES_RPMSAVE_FILE+'*')
+    os.unlink(prev_conf_file[0])
 
   @patch("platform.linux_distribution")
   def test_os_type_check(self, mock_linux_distribution):