summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-14 11:46:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-14 22:22:13 +0100
commit56a490027342a8847ccf7bec50f616880acfd369 (patch)
tree6fd60b16edb75ae5aacd11067d2024c3a664bb0b /meta/lib
parent0825fcf7001aabc2084cc10e8d9aebbf327c884b (diff)
downloadpoky-56a490027342a8847ccf7bec50f616880acfd369.tar.gz
Revert "oeqa.runtime.smart: work around smart race issues"
We have a proper fix now so we can remove the workaround. This reverts commit 4d268abc2fc892c5d34449f78c8e9f2b1a9d6bac. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/runtime/smart.py25
1 files changed, 0 insertions, 25 deletions
diff --git a/meta/lib/oeqa/runtime/smart.py b/meta/lib/oeqa/runtime/smart.py
index a15e4027d8..6cdb10d631 100644
--- a/meta/lib/oeqa/runtime/smart.py
+++ b/meta/lib/oeqa/runtime/smart.py
@@ -2,7 +2,6 @@ import unittest
2import re 2import re
3import oe 3import oe
4import subprocess 4import subprocess
5from time import sleep
6from oeqa.oetest import oeRuntimeTest, skipModule 5from oeqa.oetest import oeRuntimeTest, skipModule
7from oeqa.utils.decorators import * 6from oeqa.utils.decorators import *
8from oeqa.utils.httpserver import HTTPService 7from oeqa.utils.httpserver import HTTPService
@@ -145,21 +144,13 @@ class SmartRepoTest(SmartTest):
145 @skipUnlessPassed('test_smart_channel_add') 144 @skipUnlessPassed('test_smart_channel_add')
146 def test_smart_install(self): 145 def test_smart_install(self):
147 self.smart('remove -y psplash-default') 146 self.smart('remove -y psplash-default')
148 # NOTE: this sleep is a hack for working around #10244
149 sleep(1)
150 self.smart('install -y psplash-default') 147 self.smart('install -y psplash-default')
151 # NOTE: this sleep is a hack for working around #10244
152 sleep(1)
153 148
154 @testcase(728) 149 @testcase(728)
155 @skipUnlessPassed('test_smart_install') 150 @skipUnlessPassed('test_smart_install')
156 def test_smart_install_dependency(self): 151 def test_smart_install_dependency(self):
157 self.smart('remove -y psplash') 152 self.smart('remove -y psplash')
158 # NOTE: this sleep is a hack for working around #10244
159 sleep(1)
160 self.smart('install -y psplash-default') 153 self.smart('install -y psplash-default')
161 # NOTE: this sleep is a hack for working around #10244
162 sleep(1)
163 154
164 @testcase(723) 155 @testcase(723)
165 @skipUnlessPassed('test_smart_channel_add') 156 @skipUnlessPassed('test_smart_channel_add')
@@ -167,8 +158,6 @@ class SmartRepoTest(SmartTest):
167 self.smart('remove -y psplash-default') 158 self.smart('remove -y psplash-default')
168 self.smart('download psplash-default') 159 self.smart('download psplash-default')
169 self.smart('install -y ./psplash-default*') 160 self.smart('install -y ./psplash-default*')
170 # NOTE: this sleep is a hack for working around #10244
171 sleep(1)
172 161
173 @testcase(725) 162 @testcase(725)
174 @skipUnlessPassed('test_smart_channel_add') 163 @skipUnlessPassed('test_smart_channel_add')
@@ -177,29 +166,19 @@ class SmartRepoTest(SmartTest):
177 url = re.search('(http://.*/psplash-default.*\.rpm)', output) 166 url = re.search('(http://.*/psplash-default.*\.rpm)', output)
178 self.assertTrue(url, msg="Couln't find download url in %s" % output) 167 self.assertTrue(url, msg="Couln't find download url in %s" % output)
179 self.smart('remove -y psplash-default') 168 self.smart('remove -y psplash-default')
180 # NOTE: this sleep is a hack for working around #10244
181 sleep(1)
182 self.smart('install -y %s' % url.group(0)) 169 self.smart('install -y %s' % url.group(0))
183 # NOTE: this sleep is a hack for working around #10244
184 sleep(1)
185 170
186 @testcase(729) 171 @testcase(729)
187 @skipUnlessPassed('test_smart_install') 172 @skipUnlessPassed('test_smart_install')
188 def test_smart_reinstall(self): 173 def test_smart_reinstall(self):
189 self.smart('reinstall -y psplash-default') 174 self.smart('reinstall -y psplash-default')
190 # NOTE: this sleep is a hack for working around #10244
191 sleep(1)
192 175
193 @testcase(727) 176 @testcase(727)
194 @skipUnlessPassed('test_smart_channel_add') 177 @skipUnlessPassed('test_smart_channel_add')
195 def test_smart_remote_repo(self): 178 def test_smart_remote_repo(self):
196 self.smart('update') 179 self.smart('update')
197 self.smart('install -y psplash') 180 self.smart('install -y psplash')
198 # NOTE: this sleep is a hack for working around #10244
199 sleep(1)
200 self.smart('remove -y psplash') 181 self.smart('remove -y psplash')
201 # NOTE: this sleep is a hack for working around #10244
202 sleep(1)
203 182
204 @testcase(726) 183 @testcase(726)
205 def test_smart_local_dir(self): 184 def test_smart_local_dir(self):
@@ -213,8 +192,6 @@ class SmartRepoTest(SmartTest):
213 self.smart('channel --disable '+str(i)) 192 self.smart('channel --disable '+str(i))
214 self.target.run('cd $HOME') 193 self.target.run('cd $HOME')
215 self.smart('install psplash') 194 self.smart('install psplash')
216 # NOTE: this sleep is a hack for working around #10244
217 sleep(1)
218 for i in output.split("\n"): 195 for i in output.split("\n"):
219 if ("rpmsys" != str(i)) and ("myrpmdir" != str(i)): 196 if ("rpmsys" != str(i)) and ("myrpmdir" != str(i)):
220 self.smart('channel --enable '+str(i)) 197 self.smart('channel --enable '+str(i))
@@ -238,6 +215,4 @@ class SmartRepoTest(SmartTest):
238 @skipUnlessPassed('test_smart_channel_add') 215 @skipUnlessPassed('test_smart_channel_add')
239 def test_smart_remove_package(self): 216 def test_smart_remove_package(self):
240 self.smart('install -y psplash') 217 self.smart('install -y psplash')
241 # NOTE: this sleep is a hack for working around #10244
242 sleep(1)
243 self.smart('remove -y psplash') 218 self.smart('remove -y psplash')