[ambari] branch trunk updated: [AMBARI-23264] Fix TestMySqlServer error while executing unit tests on MacOS/Darwin

[rl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rlevas pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 10a1e8b  [AMBARI-23264] Fix TestMySqlServer error while executing unit tests on MacOS/Darwin
10a1e8b is described below

commit 10a1e8b692ecd3de8b79bda1abc6fd6b0a8547ce
Author: Robert Levas <rl...@hortonworks.com>
AuthorDate: Fri Mar 16 12:39:27 2018 -0400

    [AMBARI-23264] Fix TestMySqlServer error while executing unit tests on MacOS/Darwin
---
 ambari-server/src/test/python/stacks/2.0.6/HIVE/test_mysql_server.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_mysql_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_mysql_server.py
index c204117..bcf6a39 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_mysql_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_mysql_server.py
@@ -17,13 +17,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 '''
-import os
+from ambari_commons.os_check import OSCheck
 from mock.mock import MagicMock, call, patch
 from stacks.utils.RMFTestCase import *
 
-from only_for_platform import not_for_platform, PLATFORM_WINDOWS
+from only_for_platform import not_for_platform, os_distro_value, PLATFORM_WINDOWS
 
 @patch("os.path.exists", MagicMock(return_value=True))
+@patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = os_distro_value))
 @not_for_platform(PLATFORM_WINDOWS)
 class TestMySqlServer(RMFTestCase):
   COMMON_SERVICES_PACKAGE_DIR = "HIVE/0.12.0.2.0/package"

-- 
To stop receiving notification emails like this one, please contact
rlevas@apache.org.