From aa13257c5b4fae050cd8c43ea819e161a8b814b2 Mon Sep 17 00:00:00 2001 From: Greg Neagle Date: Sat, 31 Dec 2016 14:18:30 -0800 Subject: [PATCH] Get tests working in this branch --- {tests => code/client/tests}/README.md | 0 {tests => code/client/tests}/__init__.py | 0 .../client/tests/munkilib}/__init__.py | 0 .../tests/munkilib/munkicommon}/__init__.py | 0 .../munkilib/munkicommon/data_scaffolds.py | 0 .../munkicommon/test_display_unicode.py | 52 +++++++++---------- .../munkilib/munkicommon/test_isapprunning.py | 38 +++++++------- {tests => code/client/tests}/travisci.py | 0 tests/code/client/munkilib/__init__.py | 0 .../client/munkilib/munkicommon/__init__.py | 0 10 files changed, 45 insertions(+), 45 deletions(-) rename {tests => code/client/tests}/README.md (100%) rename {tests => code/client/tests}/__init__.py (100%) rename {tests/code => code/client/tests/munkilib}/__init__.py (100%) rename {tests/code/client => code/client/tests/munkilib/munkicommon}/__init__.py (100%) rename {tests/code/client => code/client/tests}/munkilib/munkicommon/data_scaffolds.py (100%) rename tests/code/client/munkilib/munkicommon/test_unicode.py => code/client/tests/munkilib/munkicommon/test_display_unicode.py (61%) rename {tests/code/client => code/client/tests}/munkilib/munkicommon/test_isapprunning.py (63%) mode change 100644 => 100755 rename {tests => code/client/tests}/travisci.py (100%) delete mode 100644 tests/code/client/munkilib/__init__.py delete mode 100644 tests/code/client/munkilib/munkicommon/__init__.py diff --git a/tests/README.md b/code/client/tests/README.md similarity index 100% rename from tests/README.md rename to code/client/tests/README.md diff --git a/tests/__init__.py b/code/client/tests/__init__.py similarity index 100% rename from tests/__init__.py rename to code/client/tests/__init__.py diff --git a/tests/code/__init__.py b/code/client/tests/munkilib/__init__.py similarity index 100% rename from tests/code/__init__.py rename to code/client/tests/munkilib/__init__.py diff --git a/tests/code/client/__init__.py b/code/client/tests/munkilib/munkicommon/__init__.py similarity index 100% rename from tests/code/client/__init__.py rename to code/client/tests/munkilib/munkicommon/__init__.py diff --git a/tests/code/client/munkilib/munkicommon/data_scaffolds.py b/code/client/tests/munkilib/munkicommon/data_scaffolds.py similarity index 100% rename from tests/code/client/munkilib/munkicommon/data_scaffolds.py rename to code/client/tests/munkilib/munkicommon/data_scaffolds.py diff --git a/tests/code/client/munkilib/munkicommon/test_unicode.py b/code/client/tests/munkilib/munkicommon/test_display_unicode.py similarity index 61% rename from tests/code/client/munkilib/munkicommon/test_unicode.py rename to code/client/tests/munkilib/munkicommon/test_display_unicode.py index 899b4385..3d06ae5e 100755 --- a/tests/code/client/munkilib/munkicommon/test_unicode.py +++ b/code/client/tests/munkilib/munkicommon/test_display_unicode.py @@ -1,9 +1,9 @@ #!/usr/bin/python # encoding: utf-8 """ -munkicommon_display_unicode_test.py +test_display_unicode.py -Unit tests for munkicommon's display_* functions. +Unit tests for display.display_* functions. """ # Copyright 2014-2016 Greg Neagle. @@ -21,7 +21,7 @@ Unit tests for munkicommon's display_* functions. # limitations under the License. -import code.client.munkilib.munkicommon as munkicommon +import munkilib.display as display import unittest @@ -33,79 +33,79 @@ ARG_STR = 'Günther' def log(msg, logname=''): - """Redefine munkicommon's logging function so our tests don't write + """Redefine the logging function so our tests don't write a bunch of garbage to Munki's logs""" pass -munkicommon.log = log +display.munkilog.log = log class TestDisplayInfoUnicodeOutput(unittest.TestCase): - """Test munkicommon display_info with text that may or may not be proper + """Test display_info with text that may or may not be proper Unicode.""" def test_display_info_with_unicode_msg(self): - munkicommon.display_info(MSG_UNI) + display.display_info(MSG_UNI) def test_display_info_with_str_msg(self): - munkicommon.display_info(MSG_STR) + display.display_info(MSG_STR) def test_display_info_with_unicode_msg_unicode_arg(self): - munkicommon.display_info(MSG_UNI, ARG_UNI) + display.display_info(MSG_UNI, ARG_UNI) def test_display_info_with_unicode_msg_str_arg(self): - munkicommon.display_info(MSG_UNI, ARG_STR) + display.display_info(MSG_UNI, ARG_STR) def test_display_info_with_str_msg_unicode_arg(self): - munkicommon.display_info(MSG_STR, ARG_UNI) + display.display_info(MSG_STR, ARG_UNI) def test_display_info_with_str_msg_str_arg(self): - munkicommon.display_info(MSG_STR, ARG_STR) + display.display_info(MSG_STR, ARG_STR) class TestDisplayWarningUnicodeOutput(unittest.TestCase): - """Test munkicommon display_warning with text that may or may not be proper + """Test display_warning with text that may or may not be proper Unicode.""" def test_display_warning_with_unicode_msg(self): - munkicommon.display_warning(MSG_UNI) + display.display_warning(MSG_UNI) def test_display_warning_with_str_msg(self): - munkicommon.display_warning(MSG_STR) + display.display_warning(MSG_STR) def test_display_warning_with_unicode_msg_unicode_arg(self): - munkicommon.display_warning(MSG_UNI, ARG_UNI) + display.display_warning(MSG_UNI, ARG_UNI) def test_display_warning_with_unicode_msg_str_arg(self): - munkicommon.display_warning(MSG_UNI, ARG_STR) + display.display_warning(MSG_UNI, ARG_STR) def test_display_warning_with_str_msg_unicode_arg(self): - munkicommon.display_warning(MSG_STR, ARG_UNI) + display.display_warning(MSG_STR, ARG_UNI) def test_display_warning_with_str_msg_str_arg(self): - munkicommon.display_warning(MSG_STR, ARG_STR) + display.display_warning(MSG_STR, ARG_STR) class TestDisplayErrorUnicodeOutput(unittest.TestCase): - """Test munkicommon display_error with text that may or may not be proper + """Test display_error with text that may or may not be proper Unicode.""" def test_display_error_with_unicode_msg(self): - munkicommon.display_error(MSG_UNI) + display.display_error(MSG_UNI) def test_display_error_with_str_msg(self): - munkicommon.display_error(MSG_STR) + display.display_error(MSG_STR) def test_display_error_with_unicode_msg_unicode_arg(self): - munkicommon.display_error(MSG_UNI, ARG_UNI) + display.display_error(MSG_UNI, ARG_UNI) def test_display_error_with_unicode_msg_str_arg(self): - munkicommon.display_error(MSG_UNI, ARG_STR) + display.display_error(MSG_UNI, ARG_STR) def test_display_error_with_str_msg_unicode_arg(self): - munkicommon.display_error(MSG_STR, ARG_UNI) + display.display_error(MSG_STR, ARG_UNI) def test_display_error_with_str_msg_str_arg(self): - munkicommon.display_error(MSG_STR, ARG_STR) + display.display_error(MSG_STR, ARG_STR) def main(): diff --git a/tests/code/client/munkilib/munkicommon/test_isapprunning.py b/code/client/tests/munkilib/munkicommon/test_isapprunning.py old mode 100644 new mode 100755 similarity index 63% rename from tests/code/client/munkilib/munkicommon/test_isapprunning.py rename to code/client/tests/munkilib/munkicommon/test_isapprunning.py index 2bb3ad66..181d301c --- a/tests/code/client/munkilib/munkicommon/test_isapprunning.py +++ b/code/client/tests/munkilib/munkicommon/test_isapprunning.py @@ -1,9 +1,9 @@ #!/usr/bin/python # encoding: utf-8 """ -munkicommon_display_unicode_test.py +test_isapprunning.py -Unit tests for munkicommon's display_* functions. +Unit tests for processes.isAppRunning. """ # Copyright 2016-present Nate Walck. @@ -21,7 +21,7 @@ Unit tests for munkicommon's display_* functions. # limitations under the License. -import code.client.munkilib.munkicommon as munkicommon +from munkilib import processes import unittest from data_scaffolds import getRunningProcessesMock @@ -42,67 +42,67 @@ class TestIsAppRunning(unittest.TestCase): def tearDown(self): self.processes = [] - @patch('code.client.munkilib.munkicommon.getRunningProcesses', return_value=getRunningProcessesMock()) + @patch('munkilib.processes.getRunningProcesses', return_value=getRunningProcessesMock()) def test_app_with_exact_path_match(self, ps_mock): print("Testing isAppRunning with exact path match...") self.assertEqual( - munkicommon.isAppRunning('/Applications/Firefox.app/Contents/MacOS/firefox'), + processes.isAppRunning('/Applications/Firefox.app/Contents/MacOS/firefox'), True ) - @patch('code.client.munkilib.munkicommon.getRunningProcesses', return_value=getRunningProcessesMock()) + @patch('munkilib.processes.getRunningProcesses', return_value=getRunningProcessesMock()) def test_app_with_exact_path_no_match(self, ps_mock): print("Testing isAppRunning with exact path no matches...") self.assertEqual( - munkicommon.isAppRunning('/usr/local/bin/bonzi'), + processes.isAppRunning('/usr/local/bin/bonzi'), False ) - @patch('code.client.munkilib.munkicommon.getRunningProcesses', return_value=getRunningProcessesMock()) + @patch('munkilib.processes.getRunningProcesses', return_value=getRunningProcessesMock()) def test_app_by_filename_match(self, ps_mock): print("Testing isAppRunning with file name match...") self.assertEqual( - munkicommon.isAppRunning('Firefox.app'), + processes.isAppRunning('Firefox.app'), True ) - @patch('code.client.munkilib.munkicommon.getRunningProcesses', return_value=getRunningProcessesMock()) + @patch('munkilib.processes.getRunningProcesses', return_value=getRunningProcessesMock()) def test_app_by_filename_no_match(self, ps_mock): print("Testing isAppRunning with file name no matches...") self.assertEqual( - munkicommon.isAppRunning('BonziBUDDY.app'), + processes.isAppRunning('BonziBUDDY.app'), False ) - @patch('code.client.munkilib.munkicommon.getRunningProcesses', return_value=getRunningProcessesMock()) + @patch('munkilib.processes.getRunningProcesses', return_value=getRunningProcessesMock()) def test_app_by_executable_name_match(self, ps_mock): print("Testing isAppRunning with executable name match...") self.assertEqual( - munkicommon.isAppRunning('firefox'), + processes.isAppRunning('firefox'), True ) - @patch('code.client.munkilib.munkicommon.getRunningProcesses', return_value=getRunningProcessesMock()) + @patch('munkilib.processes.getRunningProcesses', return_value=getRunningProcessesMock()) def test_app_by_executable_name_no_match(self, ps_mock): print("Testing isAppRunning with executable name no matches...") self.assertEqual( - munkicommon.isAppRunning('bonzi'), + processes.isAppRunning('bonzi'), False ) - @patch('code.client.munkilib.munkicommon.getRunningProcesses', return_value=getRunningProcessesMock()) + @patch('munkilib.processes.getRunningProcesses', return_value=getRunningProcessesMock()) def test_app_name_with_dot_app_match(self, ps_mock): print("Testing isAppRunning with name plus .app match...") self.assertEqual( - munkicommon.isAppRunning('Firefox'), + processes.isAppRunning('Firefox'), True ) - @patch('code.client.munkilib.munkicommon.getRunningProcesses', return_value=getRunningProcessesMock()) + @patch('munkilib.processes.getRunningProcesses', return_value=getRunningProcessesMock()) def test_app_name_with_dot_app_no_match(self, ps_mock): print("Testing isAppRunning with name plus .app match...") self.assertEqual( - munkicommon.isAppRunning('BonziBUDDY'), + processes.isAppRunning('BonziBUDDY'), False ) diff --git a/tests/travisci.py b/code/client/tests/travisci.py similarity index 100% rename from tests/travisci.py rename to code/client/tests/travisci.py diff --git a/tests/code/client/munkilib/__init__.py b/tests/code/client/munkilib/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/code/client/munkilib/munkicommon/__init__.py b/tests/code/client/munkilib/munkicommon/__init__.py deleted file mode 100644 index e69de29b..00000000