AMBARI-12171 Windows unit tests: Common unit tests: fix the imports & failing patches

Fixed the imports. Coalesced the OS mock.

ambari-agent/src/test/python/resource_management/TestContentSources.py

@@ -18,7 +18,9 @@ limitations under the License.
 
 from unittest import TestCase
 from mock.mock import patch, MagicMock
-from only_for_platform import get_platform, not_for_platform, PLATFORM_WINDOWS
+from only_for_platform import get_platform, not_for_platform, os_distro_value, PLATFORM_WINDOWS
+
+from ambari_commons.os_check import OSCheck
 
 from resource_management.core import Environment
 from resource_management.core.system import System
@@ -35,7 +37,7 @@ import urllib2
 import os
 
 
-@patch.object(System, "os_family", new = 'redhat')
+@patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = os_distro_value))
 class TestContentSources(TestCase):
 
   @patch.object(os.path, "isfile")

ambari-agent/src/test/python/resource_management/TestDirectoryResource.py

@@ -18,7 +18,9 @@ limitations under the License.
 
 from unittest import TestCase
 from mock.mock import patch, MagicMock
-from only_for_platform import get_platform, not_for_platform, PLATFORM_WINDOWS
+from only_for_platform import get_platform, not_for_platform, os_distro_value, PLATFORM_WINDOWS
+
+from ambari_commons.os_check import OSCheck
 
 import os
 from resource_management.core.system import System
@@ -30,9 +32,10 @@ if get_platform() != PLATFORM_WINDOWS:
   import grp
 
 
-@patch.object(System, "os_family", new = 'redhat')
+@patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = os_distro_value))
 class TestDirectoryResource(TestCase):
-  
+
+  @not_for_platform(PLATFORM_WINDOWS)
   @patch("resource_management.core.sudo.path_exists")
   @patch("resource_management.core.sudo.makedirs")
   @patch("resource_management.core.sudo.path_isdir")

ambari-agent/src/test/python/resource_management/TestExecuteHadoopResource.py

@@ -19,12 +19,16 @@ limitations under the License.
 import os
 
 from unittest import TestCase
-from mock.mock import patch
+from mock.mock import patch, MagicMock
+from only_for_platform import get_platform, not_for_platform, os_distro_value, PLATFORM_WINDOWS
+
+from ambari_commons.os_check import OSCheck
+
 from resource_management import *
 from resource_management.libraries.resources.execute_hadoop\
   import ExecuteHadoop
 
-@patch.object(System, "os_family", new = 'redhat')
+@patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = os_distro_value))
 class TestExecuteHadoopResource(TestCase):
   @patch("resource_management.core.providers.system.ExecuteProvider")
   def test_run_default_args(self, execute_mock):

ambari-agent/src/test/python/resource_management/TestExecuteResource.py

@@ -18,7 +18,9 @@ limitations under the License.
 
 from unittest import TestCase
 from mock.mock import patch, MagicMock, call
-from only_for_platform import get_platform, not_for_platform, PLATFORM_WINDOWS
+from only_for_platform import get_platform, not_for_platform, os_distro_value, PLATFORM_WINDOWS
+
+from ambari_commons.os_check import OSCheck
 
 from resource_management.core.system import System
 from resource_management.core.resources.system import Execute
@@ -36,7 +38,7 @@ if get_platform() != PLATFORM_WINDOWS:
 import select
 
 
-@patch.object(System, "os_family", new='redhat')
+@patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = os_distro_value))
 class TestExecuteResource(TestCase):
   @patch.object(os, "read")
   @patch.object(select, "select")

ambari-agent/src/test/python/resource_management/TestFileResource.py

@@ -19,7 +19,9 @@ limitations under the License.
 
 from unittest import TestCase
 from mock.mock import patch, MagicMock
-from only_for_platform import get_platform, not_for_platform, PLATFORM_WINDOWS
+from only_for_platform import get_platform, not_for_platform, os_distro_value, PLATFORM_WINDOWS
+
+from ambari_commons.os_check import OSCheck
 
 import os
 import sys
@@ -32,9 +34,12 @@ if get_platform() != PLATFORM_WINDOWS:
   import resource_management.core.providers.system
   import grp
   import pwd
+else:
+  import resource_management.core.providers.windows.system
+
 
 
-@patch.object(System, "os_family", new = 'redhat')
+@patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = os_distro_value))
 class TestFileResource(TestCase):
   @patch.object(os.path, "dirname")
   @patch("resource_management.core.sudo.path_isdir")

ambari-agent/src/test/python/resource_management/TestGroupResource.py

@@ -18,15 +18,17 @@ limitations under the License.
 
 from unittest import TestCase
 from mock.mock import patch, MagicMock
-from only_for_platform import get_platform, not_for_platform, PLATFORM_WINDOWS
+from only_for_platform import get_platform, not_for_platform, os_distro_value, PLATFORM_WINDOWS
+
+from ambari_commons.os_check import OSCheck
 
 from resource_management.core import Environment, Fail
 from resource_management.core.resources import Group
 from resource_management.core.system import System
 
-import subprocess
 import os
 import select
+import subprocess
 
 if get_platform() != PLATFORM_WINDOWS:
   import grp
@@ -35,9 +37,9 @@ if get_platform() != PLATFORM_WINDOWS:
 
 subproc_stdout = MagicMock()
 
+@patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = os_distro_value))
 @patch.object(os, "read", new=MagicMock(return_value=None))
 @patch.object(select, "select", new=MagicMock(return_value=([subproc_stdout], None, None)))
-@patch.object(System, "os_family", new = 'redhat')
 @patch.object(os, "environ", new = {'PATH':'/bin'})
 @patch("pty.openpty", new = MagicMock(return_value=(1,5)))
 @patch.object(os, "close", new=MagicMock())

ambari-agent/src/test/python/resource_management/TestLinkResource.py

@@ -18,7 +18,9 @@ limitations under the License.
 
 from unittest import TestCase
 from mock.mock import patch, MagicMock
-from only_for_platform import get_platform, not_for_platform, PLATFORM_WINDOWS
+from only_for_platform import get_platform, not_for_platform, os_distro_value, PLATFORM_WINDOWS
+
+from ambari_commons.os_check import OSCheck
 
 from resource_management.core import Environment, Fail
 from resource_management.core.system import System
@@ -26,7 +28,7 @@ from resource_management.core.resources.system import Link
 
 import os
 
-@patch.object(System, "os_family", new = 'redhat')
+@patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = os_distro_value))
 class TestLinkResource(TestCase):
 
   @patch.object(os.path, "realpath")
@@ -143,5 +145,3 @@ class TestLinkResource(TestCase):
            action = "delete"
       )    
     unlink_mock.assert_called_with("/some_path")
-      
-  

ambari-agent/src/test/python/resource_management/TestPropertiesFileResource.py

@@ -24,13 +24,15 @@ import os
 import time
 from unittest import TestCase
 from mock.mock import patch, MagicMock
-from only_for_platform import get_platform, not_for_platform, PLATFORM_WINDOWS
+from only_for_platform import get_platform, not_for_platform, os_distro_value, PLATFORM_WINDOWS
+
+from ambari_commons.os_check import OSCheck
 
 from resource_management.core import Environment
 from resource_management.core.system import System
 from resource_management.libraries import PropertiesFile
 
-@patch.object(System, "os_family", new='redhat')
+@patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = os_distro_value))
 class TestPropertiesFIleResource(TestCase):
   """
   PropertiesFile="resource_management.libraries.providers.properties_file.PropertiesFileProvider"

ambari-agent/src/test/python/resource_management/TestRepositoryResource.py

@@ -22,11 +22,12 @@ from unittest import TestCase
 from mock.mock import patch, MagicMock
 from only_for_platform import get_platform, not_for_platform, PLATFORM_WINDOWS
 
+from ambari_commons.os_check import OSCheck
+
 from resource_management.core.environment import Environment
 from resource_management.core.source import InlineTemplate
 from resource_management.core.system import System
 from resource_management.libraries.resources.repository import Repository
-from ambari_commons.os_check import OSCheck
 
 if get_platform() != PLATFORM_WINDOWS:
   from resource_management.libraries.providers import repository

ambari-agent/src/test/python/resource_management/TestServiceResource.py

@@ -18,9 +18,16 @@ limitations under the License.
 
 from unittest import TestCase
 from mock.mock import patch, MagicMock
-from resource_management import *
+from only_for_platform import get_platform, not_for_platform, os_distro_value, PLATFORM_WINDOWS
 
-@patch.object(System, "os_family", new = 'redhat')
+from ambari_commons.os_check import OSCheck
+
+from resource_management.core.environment import Environment
+from resource_management.core.exceptions import Fail
+from resource_management.core.resources.service import Service
+
+
+@patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = os_distro_value))
 class TestServiceResource(TestCase):
 
   @patch("resource_management.core.shell.call")

ambari-agent/src/test/python/resource_management/TestTemplateConfigResource.py

@@ -17,12 +17,17 @@ limitations under the License.
 '''
 
 from unittest import TestCase
-from mock.mock import patch
+from mock.mock import patch, MagicMock
+
+from only_for_platform import get_platform, not_for_platform, os_distro_value, PLATFORM_WINDOWS
+
+from ambari_commons.os_check import OSCheck
+
 from resource_management import *
 from resource_management.libraries.resources.template_config \
   import TemplateConfig
 
-@patch.object(System, "os_family", new = 'redhat')
+@patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = os_distro_value))
 class TestTemplateConfigResource(TestCase):
 
   @patch("resource_management.libraries.providers.template_config.Template")

ambari-agent/src/test/python/resource_management/TestUserResource.py

@@ -18,7 +18,10 @@ limitations under the License.
 
 from unittest import TestCase
 from mock.mock import patch, MagicMock, PropertyMock
-from only_for_platform import get_platform, not_for_platform, PLATFORM_WINDOWS
+
+from only_for_platform import get_platform, not_for_platform, os_distro_value, PLATFORM_WINDOWS
+
+from ambari_commons.os_check import OSCheck
 
 from resource_management.core import Environment, Fail
 from resource_management.core.system import System
@@ -34,9 +37,9 @@ if get_platform() != PLATFORM_WINDOWS:
 
 subproc_stdout = MagicMock()
 
+@patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = os_distro_value))
 @patch.object(os, "read", new=MagicMock(return_value=None))
 @patch.object(select, "select", new=MagicMock(return_value=([subproc_stdout], None, None)))
-@patch.object(System, "os_family", new = 'redhat')
 @patch.object(os, "environ", new = {'PATH':'/bin'})
 @patch("pty.openpty", new = MagicMock(return_value=(1,5)))
 @patch.object(os, "close", new=MagicMock())

ambari-agent/src/test/python/resource_management/TestXmlConfigResource.py

@@ -24,14 +24,18 @@ import os
 import time
 from unittest import TestCase
 from mock.mock import patch, MagicMock
-from only_for_platform import get_platform, not_for_platform, PLATFORM_WINDOWS
+
+from only_for_platform import get_platform, not_for_platform, os_distro_value, PLATFORM_WINDOWS
+
+from ambari_commons.os_check import OSCheck
 
 from resource_management.core import Environment
 from resource_management.core.system import System
 from resource_management.libraries import XmlConfig
 
 
-@patch.object(System, "os_family", new='redhat')
+
+@patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = os_distro_value))
 class TestXmlConfigResource(TestCase):
   """
   XmlConfig="resource_management.libraries.providers.xml_config.XmlConfigProvider",

ambari-agent/src/test/python/unitTests.py

@@ -50,13 +50,8 @@ LOG_FILE_NAME='tests.log'
 SELECTED_PREFIX = "_"
 PY_EXT='.py'
 
-if get_platform() == PLATFORM_WINDOWS:
-  IGNORE_FOLDERS = ["resource_management"]
-else:
-  IGNORE_FOLDERS = ["resource_management_windows"]
 
 TEST_MASK = '[Tt]est*.py'
-
 class TestAgent(unittest.TestSuite):
   def run(self, result):
     run = unittest.TestSuite.run
@@ -92,7 +87,7 @@ def get_test_files(path, mask=None, recursive=True):
       if fnmatch.fnmatch(item, mask):
         add_to_pythonpath = True
         file_list.append(item)
-    elif os.path.isdir(p)and p not in IGNORE_FOLDERS:
+    elif os.path.isdir(p):
       if recursive:
         file_list.extend(get_test_files(p, mask=mask))
     if add_to_pythonpath: