summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2013-09-03 13:01:11 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-03 18:57:38 (GMT)
commite3bc93c2eb6232f0c25517de3376a4d3c814f4f7 (patch)
treea257c4212730a85c380a89489fd60237b34abd0f /meta
parent8318816e27040dabe1db18aba50075128648df19 (diff)
downloadpoky-e3bc93c2eb6232f0c25517de3376a4d3c814f4f7.tar.gz
lib/oeqa/runtime: smart: serve repo on host ip only and increase timeout
Don't start the http server on 0.0.0.0, listen on host ip (end of tap interface) only. Also use the timeout option (default is 300s for ssh commands) for all the commands run in this module (mostly because smart update timeouts on mips). (From OE-Core rev: 8c272641ef3e8410f331ca4133d28dea8f36e4f4) Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/runtime/smart.py4
-rw-r--r--meta/lib/oeqa/utils/httpserver.py5
2 files changed, 5 insertions, 4 deletions
diff --git a/meta/lib/oeqa/runtime/smart.py b/meta/lib/oeqa/runtime/smart.py
index 6e20f96..59083ca 100644
--- a/meta/lib/oeqa/runtime/smart.py
+++ b/meta/lib/oeqa/runtime/smart.py
@@ -17,7 +17,7 @@ class SmartTest(oeRuntimeTest):
17 @skipUnlessPassed('test_smart_help') 17 @skipUnlessPassed('test_smart_help')
18 def smart(self, command, expected = 0): 18 def smart(self, command, expected = 0):
19 command = 'smart %s' % command 19 command = 'smart %s' % command
20 status, output = self.target.run(command) 20 status, output = self.target.run(command, 500)
21 message = os.linesep.join([command, output]) 21 message = os.linesep.join([command, output])
22 self.assertEqual(status, expected, message) 22 self.assertEqual(status, expected, message)
23 self.assertFalse("Cannot allocate memory" in output, message) 23 self.assertFalse("Cannot allocate memory" in output, message)
@@ -48,7 +48,7 @@ class SmartRepoTest(SmartTest):
48 48
49 @classmethod 49 @classmethod
50 def setUpClass(self): 50 def setUpClass(self):
51 self.repo_server = HTTPService(oeRuntimeTest.tc.d.getVar('DEPLOY_DIR', True)) 51 self.repo_server = HTTPService(oeRuntimeTest.tc.d.getVar('DEPLOY_DIR', True), oeRuntimeTest.tc.qemu.host_ip)
52 self.repo_server.start() 52 self.repo_server.start()
53 53
54 @classmethod 54 @classmethod
diff --git a/meta/lib/oeqa/utils/httpserver.py b/meta/lib/oeqa/utils/httpserver.py
index d4b6154..f161a1b 100644
--- a/meta/lib/oeqa/utils/httpserver.py
+++ b/meta/lib/oeqa/utils/httpserver.py
@@ -15,12 +15,13 @@ class HTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
15 15
16class HTTPService(object): 16class HTTPService(object):
17 17
18 def __init__(self, root_dir): 18 def __init__(self, root_dir, host=''):
19 self.root_dir = root_dir 19 self.root_dir = root_dir
20 self.host = host
20 self.port = 0 21 self.port = 0
21 22
22 def start(self): 23 def start(self):
23 self.server = HTTPServer(('', self.port), HTTPRequestHandler) 24 self.server = HTTPServer((self.host, self.port), HTTPRequestHandler)
24 if self.port == 0: 25 if self.port == 0:
25 self.port = self.server.server_port 26 self.port = self.server.server_port
26 self.process = multiprocessing.Process(target=self.server.server_start, args=[self.root_dir]) 27 self.process = multiprocessing.Process(target=self.server.server_start, args=[self.root_dir])