summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2013-09-13 15:48:18 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-14 08:21:00 +0100
commit214bb6828ef909f4a6ea61e792c7c715b9c3276f (patch)
treee641ee516e368241185d397abdc721b6e0f684b7
parent8ebe7be3d9494c3467b5533091bf6832030aad99 (diff)
downloadpoky-214bb6828ef909f4a6ea61e792c7c715b9c3276f.tar.gz
lib/oeqa/runtime: timeout increases
Increase the timeout for smart commands as under load for qemumips it's still to small. Also give ping more time fixing a potential timeout for sato systemd. (From OE-Core rev: daa3ad5807f6fc0d15b9310937d07a16edac6d22) Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/runtime/ping.py2
-rw-r--r--meta/lib/oeqa/runtime/smart.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/runtime/ping.py b/meta/lib/oeqa/runtime/ping.py
index 935f638891..e163b969f0 100644
--- a/meta/lib/oeqa/runtime/ping.py
+++ b/meta/lib/oeqa/runtime/ping.py
@@ -9,7 +9,7 @@ class PingTest(oeRuntimeTest):
9 def test_ping(self): 9 def test_ping(self):
10 output = '' 10 output = ''
11 status = None 11 status = None
12 endtime = time.time() + 30 12 endtime = time.time() + 60
13 while status != 0 and time.time() < endtime: 13 while status != 0 and time.time() < endtime:
14 proc = subprocess.Popen("ping -c 1 %s" % oeRuntimeTest.tc.qemu.ip, shell=True, stdout=subprocess.PIPE) 14 proc = subprocess.Popen("ping -c 1 %s" % oeRuntimeTest.tc.qemu.ip, shell=True, stdout=subprocess.PIPE)
15 output += proc.communicate()[0] 15 output += proc.communicate()[0]
diff --git a/meta/lib/oeqa/runtime/smart.py b/meta/lib/oeqa/runtime/smart.py
index e2f0aea7c5..558065525f 100644
--- a/meta/lib/oeqa/runtime/smart.py
+++ b/meta/lib/oeqa/runtime/smart.py
@@ -15,7 +15,7 @@ class SmartTest(oeRuntimeTest):
15 @skipUnlessPassed('test_smart_help') 15 @skipUnlessPassed('test_smart_help')
16 def smart(self, command, expected = 0): 16 def smart(self, command, expected = 0):
17 command = 'smart %s' % command 17 command = 'smart %s' % command
18 status, output = self.target.run(command, 500) 18 status, output = self.target.run(command, 900)
19 message = os.linesep.join([command, output]) 19 message = os.linesep.join([command, output])
20 self.assertEqual(status, expected, message) 20 self.assertEqual(status, expected, message)
21 self.assertFalse("Cannot allocate memory" in output, message) 21 self.assertFalse("Cannot allocate memory" in output, message)