ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject git commit: AMBARI-5396. test_kill_process_with_children unit test error on Jenkins (aonishuk)
Date Wed, 09 Apr 2014 14:33:58 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 3971bd139 -> 7d6acbb91


AMBARI-5396. test_kill_process_with_children unit test error on Jenkins (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7d6acbb9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7d6acbb9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7d6acbb9

Branch: refs/heads/trunk
Commit: 7d6acbb914e962f833383a8e4a6dfa273f4df792
Parents: 3971bd1
Author: Andrew Onischuk <aonishuk@hortonworks.com>
Authored: Wed Apr 9 07:33:50 2014 -0700
Committer: Andrew Onischuk <aonishuk@hortonworks.com>
Committed: Wed Apr 9 07:33:50 2014 -0700

----------------------------------------------------------------------
 .../src/test/python/ambari_agent/TestShell.py   | 39 +++++++++-----------
 1 file changed, 18 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7d6acbb9/ambari-agent/src/test/python/ambari_agent/TestShell.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/ambari_agent/TestShell.py b/ambari-agent/src/test/python/ambari_agent/TestShell.py
index 11a4ea6..a839932 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestShell.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestShell.py
@@ -54,27 +54,24 @@ class TestShell(unittest.TestCase):
   def test_kill_process_with_children(self):
     if _platform == "linux" or _platform == "linux2": # Test is Linux-specific
       gracefull_kill_delay_old = shell.gracefull_kill_delay
-      try:
-        shell.gracefull_kill_delay = 0.1
-        sleep_cmd = "sleep 314159265"
-        test_cmd = """ (({0}) | ({0} | {0})) """.format(sleep_cmd)
-        # Starting process tree (multiple process groups)
-        test_process = subprocess.Popen(test_cmd, shell=True)
-        time.sleep(0.3) # Delay to allow subprocess to start
-        # Check if processes are running
-        ps_cmd = """ps aux | grep "{0}" | grep -v grep """.format(sleep_cmd)
-        ps_process = subprocess.Popen(ps_cmd, stdout=subprocess.PIPE, shell=True)
-        (out, err) = ps_process.communicate()
-        self.assertTrue(sleep_cmd in out)
-        # Kill test process
-        shell.kill_process_with_children(test_process.pid)
-        test_process.communicate()
-        # Now test process should not be running
-        ps_process = subprocess.Popen(ps_cmd, stdout=subprocess.PIPE, shell=True)
-        (out, err) = ps_process.communicate()
-        self.assertFalse(sleep_cmd in out)
-      except IOError as e:
-        pass
+      shell.gracefull_kill_delay = 0.1
+      sleep_cmd = "sleep 314159265"
+      test_cmd = """ (({0}) & ({0} & {0})) """.format(sleep_cmd)
+      # Starting process tree (multiple process groups)
+      test_process = subprocess.Popen(test_cmd, stderr=subprocess.PIPE, stdout=subprocess.PIPE,
shell=True)
+      time.sleep(0.3) # Delay to allow subprocess to start
+      # Check if processes are running
+      ps_cmd = """ps aux """
+      ps_process = subprocess.Popen(ps_cmd, stderr=subprocess.PIPE, stdout=subprocess.PIPE,
shell=True)
+      (out, err) = ps_process.communicate()
+      self.assertTrue(sleep_cmd in out)
+      # Kill test process
+      shell.kill_process_with_children(test_process.pid)
+      test_process.communicate()
+      # Now test process should not be running
+      ps_process = subprocess.Popen(ps_cmd, stderr=subprocess.PIPE, stdout=subprocess.PIPE,
shell=True)
+      (out, err) = ps_process.communicate()
+      self.assertFalse(sleep_cmd in out)
       shell.gracefull_kill_delay = gracefull_kill_delay_old
     else:
       # Do not run under other systems


Mime
View raw message