summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/lib/oeqa/runtime/smart.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/lib/oeqa/runtime/smart.py b/meta/lib/oeqa/runtime/smart.py
index 4ea2699508..6e20f96967 100644
--- a/meta/lib/oeqa/runtime/smart.py
+++ b/meta/lib/oeqa/runtime/smart.py
@@ -1,4 +1,5 @@
1import unittest 1import unittest
2import re
2from oeqa.oetest import oeRuntimeTest 3from oeqa.oetest import oeRuntimeTest
3from oeqa.utils.decorators import * 4from oeqa.utils.decorators import *
4from oeqa.utils.httpserver import HTTPService 5from oeqa.utils.httpserver import HTTPService
@@ -19,6 +20,7 @@ class SmartTest(oeRuntimeTest):
19 status, output = self.target.run(command) 20 status, output = self.target.run(command)
20 message = os.linesep.join([command, output]) 21 message = os.linesep.join([command, output])
21 self.assertEqual(status, expected, message) 22 self.assertEqual(status, expected, message)
23 self.assertFalse("Cannot allocate memory" in output, message)
22 return output 24 return output
23 25
24class SmartBasicTest(SmartTest): 26class SmartBasicTest(SmartTest):
@@ -95,13 +97,11 @@ class SmartRepoTest(SmartTest):
95 97
96 @skipUnlessPassed('test_smart_channel_add') 98 @skipUnlessPassed('test_smart_channel_add')
97 def test_smart_install_from_http(self): 99 def test_smart_install_from_http(self):
98 url = 'http://'
99 output = self.smart('download --urls psplash-default') 100 output = self.smart('download --urls psplash-default')
100 for line in output.splitlines(): 101 url = re.search('(http://.*/psplash-default.*\.rpm)', output)
101 if line.startswith(url): 102 self.assertTrue(url, msg="Couln't find download url in %s" % output)
102 url = line
103 self.smart('remove -y psplash-default') 103 self.smart('remove -y psplash-default')
104 self.smart('install -y %s' % url) 104 self.smart('install -y %s' % url.group(0))
105 105
106 @skipUnlessPassed('test_smart_install') 106 @skipUnlessPassed('test_smart_install')
107 def test_smart_reinstall(self): 107 def test_smart_reinstall(self):