Repository: incubator-slider Updated Branches: refs/heads/develop c74648784 -> f7bd4d769
SLIDER-897 ApplicationWithAddonPackagesIT fun test failing on Windows Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f7bd4d76 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f7bd4d76 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f7bd4d76 Branch: refs/heads/develop Commit: f7bd4d7698ab24de0fa43250b345c2a6ab58751b Parents: c746487 Author: Gour Saha <[email protected]> Authored: Wed Jun 3 22:04:36 2015 -0700 Committer: Gour Saha <[email protected]> Committed: Wed Jun 3 22:04:36 2015 -0700 ---------------------------------------------------------------------- .../package/scripts/all.py | 11 ++++------- .../package/scripts/cl.py | 13 +++++-------- .../package/scripts/COMMAND_LOGGER.py | 17 +++++++---------- .../add-on-package-echo/package/scripts/echo.py | 7 +------ .../ApplicationWithAddonPackagesIT.groovy | 2 -- 5 files changed, 17 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f7bd4d76/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-all-component/package/scripts/all.py ---------------------------------------------------------------------- diff --git a/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-all-component/package/scripts/all.py b/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-all-component/package/scripts/all.py index 9361e10..0099ac1 100644 --- a/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-all-component/package/scripts/all.py +++ b/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-all-component/package/scripts/all.py @@ -26,18 +26,15 @@ import tempfile class ALL(Script): def install(self, env): self.install_packages(env) - f = tempfile.NamedTemporaryFile(mode='w+t') + f = tempfile.NamedTemporaryFile(mode='w+t', delete=False) TMP_LOCAL_FILE = f.name try: - tmp_file = open(TMP_LOCAL_FILE, 'w') - tmp_file.write("testing...") - tmp_file.close() + f.write("testing...") print TMP_LOCAL_FILE - cat = subprocess.Popen(["hdfs", "dfs", "-copyFromLocal", TMP_LOCAL_FILE, - "/tmp/test_slider.txt"], stdout=subprocess.PIPE) - cat.communicate() finally: f.close() + cat = subprocess.Popen("hdfs dfs -copyFromLocal " + TMP_LOCAL_FILE + " /tmp/test_slider.txt", shell=True) + cat.communicate() print "running install for all components in add on pkg" def configure(self, env): http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f7bd4d76/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-multi-component/package/scripts/cl.py ---------------------------------------------------------------------- diff --git a/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-multi-component/package/scripts/cl.py b/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-multi-component/package/scripts/cl.py index 1316db0..3b61efd 100644 --- a/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-multi-component/package/scripts/cl.py +++ b/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-multi-component/package/scripts/cl.py @@ -26,18 +26,15 @@ import tempfile class CL(Script): def install(self, env): self.install_packages(env) - f = tempfile.NamedTemporaryFile(mode='w+t') + f = tempfile.NamedTemporaryFile(mode='w+t', delete=False) + TMP_LOCAL_FILE = f.name try: - TMP_LOCAL_FILE = f.name - tmp_file = open(TMP_LOCAL_FILE, 'w') - tmp_file.write("testing...") - tmp_file.close() + f.write("testing...") print TMP_LOCAL_FILE - cat = subprocess.Popen(["hdfs", "dfs", "-copyFromLocal", TMP_LOCAL_FILE, - "/tmp/test_slider.txt"], stdout=subprocess.PIPE) - cat.communicate() finally: f.close() + cat = subprocess.Popen("hdfs dfs -copyFromLocal " + TMP_LOCAL_FILE + " /tmp/test_slider.txt", shell=True) + cat.communicate() print "running install for all components in add on pkg" def configure(self, env): http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f7bd4d76/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-one-component/package/scripts/COMMAND_LOGGER.py ---------------------------------------------------------------------- diff --git a/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-one-component/package/scripts/COMMAND_LOGGER.py b/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-one-component/package/scripts/COMMAND_LOGGER.py index 774e7be..1fc7868 100644 --- a/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-one-component/package/scripts/COMMAND_LOGGER.py +++ b/slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-one-component/package/scripts/COMMAND_LOGGER.py @@ -26,19 +26,16 @@ import tempfile class COMMAND_LOGGER(Script): def install(self, env): self.install_packages(env) - f = tempfile.NamedTemporaryFile(mode='w+t') - try: - TMP_LOCAL_FILE = f.name - tmp_file = open(TMP_LOCAL_FILE, 'w') - tmp_file.write("testing...") - tmp_file.close() + f = tempfile.NamedTemporaryFile(mode='w+t', delete=False) + TMP_LOCAL_FILE = f.name + try: + f.write("testing...") print TMP_LOCAL_FILE - cat = subprocess.Popen(["hdfs", "dfs", "-copyFromLocal", TMP_LOCAL_FILE, - "/tmp/test_slider.txt"], stdout=subprocess.PIPE) - cat.communicate() finally: f.close() - print "running install for command_logger components in add on pkg" + cat = subprocess.Popen("hdfs dfs -copyFromLocal " + TMP_LOCAL_FILE + " /tmp/test_slider.txt", shell=True) + cat.communicate() + print "running install for all components in add on pkg" def configure(self, env): import params http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f7bd4d76/slider-core/src/test/app_packages/test_add_on_package/add-on-package-echo/package/scripts/echo.py ---------------------------------------------------------------------- diff --git a/slider-core/src/test/app_packages/test_add_on_package/add-on-package-echo/package/scripts/echo.py b/slider-core/src/test/app_packages/test_add_on_package/add-on-package-echo/package/scripts/echo.py index 805aad7..dce98bc 100644 --- a/slider-core/src/test/app_packages/test_add_on_package/add-on-package-echo/package/scripts/echo.py +++ b/slider-core/src/test/app_packages/test_add_on_package/add-on-package-echo/package/scripts/echo.py @@ -26,12 +26,7 @@ from resource_management import * class ECHO(Script): def install(self, env): self.install_packages(env) - tmp_file_path = "test_slider" - tmp_file = open(tmp_file_path, 'w') - tmp_file.write("testing...") - cat = subprocess.Popen(["hdfs", "dfs", "-copyFromLocal", tmp_file_path, "/tmp"], stdout=subprocess.PIPE) - cat.communicate() - print "running install for command_logger components in add on pkg" + print "running install for add on pkg" def configure(self, env): import params http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f7bd4d76/slider-funtest/src/test/groovy/org/apache/slider/funtest/coprocessors/ApplicationWithAddonPackagesIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/coprocessors/ApplicationWithAddonPackagesIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/coprocessors/ApplicationWithAddonPackagesIT.groovy index aa8a083..753e914 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/coprocessors/ApplicationWithAddonPackagesIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/coprocessors/ApplicationWithAddonPackagesIT.groovy @@ -52,8 +52,6 @@ public class ApplicationWithAddonPackagesIT extends AgentCommandTestBase{ static String CLUSTER = "test-application-with-add-on" static String APP_RESOURCE2 = "../slider-core/src/test/app_packages/test_command_log/resources_add_on_pkg.json" - static String APP_META12 = "../slider-core/src/test/app_packages/test_addon_pkg/metainfo.json" - static String APP_TEMPLATE12 = "../slider-core/src/test/app_packages/test_addon_pkg/appConfig.json" static String ADD_ON_PACKAGE_ONE_COMPONENT = "../slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-one-component/" static String ADD_ON_PACKAGE_ALL_COMPONENT = "../slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-all-component/" static String ADD_ON_PACKAGE_MULTI_COMPONENT = "../slider-core/src/test/app_packages/test_add_on_package/add-on-package-apply-on-multi-component/"
