summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Callaghan <dcallagh@redhat.com>2011-03-10 16:36:58 +1000
committerDan Callaghan <dcallagh@redhat.com>2011-03-10 16:37:38 +1000
commit2367e74ca19ef4e3f2c405298e34e717f339ba8a (patch)
tree663df1e51219f679a6a86b7f0a86d50b446470b2
parent0a411d0c5d46648e5e03c0fdbb13f724c2515a37 (diff)
test_submit_task: fix timeouts, add some extra assertions
-rw-r--r--Server/bkr/server/test/selenium/test_tasks.py20
1 files changed, 12 insertions, 8 deletions
diff --git a/Server/bkr/server/test/selenium/test_tasks.py b/Server/bkr/server/test/selenium/test_tasks.py
index 7342333..2b639b5 100644
--- a/Server/bkr/server/test/selenium/test_tasks.py
+++ b/Server/bkr/server/test/selenium/test_tasks.py
@@ -23,34 +23,38 @@ class TestSubmitTask(bkr.server.test.selenium.SeleniumTestCase):
# upload v1.1 first...
sel.click('link=New Task')
- sel.wait_for_page_to_load('3000')
+ sel.wait_for_page_to_load('30000')
sel.type('task_task_rpm',
pkg_resources.resource_filename(self.__module__,
'tmp-distribution-beaker-task_test-1.1-0.noarch.rpm'))
sel.click('//input[@value="Submit Data"]')
- sel.wait_for_page_to_load('3000')
+ sel.wait_for_page_to_load('30000')
+ self.assert_(('%s Added/Updated' % test_package_name)
+ in sel.get_text('css=.flash'))
# ...and make sure it worked...
sel.type('simplesearch', test_package_name)
sel.click('search')
- sel.wait_for_page_to_load('3000')
+ sel.wait_for_page_to_load('30000')
sel.click('link=%s' % test_package_name)
- sel.wait_for_page_to_load('3000')
+ sel.wait_for_page_to_load('30000')
self.assert_task_correct_v1_1()
# ...then upload v2.0...
sel.click('link=New Task')
- sel.wait_for_page_to_load('3000')
+ sel.wait_for_page_to_load('30000')
sel.type('task_task_rpm',
pkg_resources.resource_filename(self.__module__,
'tmp-distribution-beaker-task_test-2.0-2.noarch.rpm'))
sel.click('//input[@value="Submit Data"]')
- sel.wait_for_page_to_load('3000')
+ sel.wait_for_page_to_load('30000')
+ self.assert_(('%s Added/Updated' % test_package_name)
+ in sel.get_text('css=.flash'))
# ...and make sure everything was updated
sel.type('simplesearch', test_package_name)
sel.click('search')
- sel.wait_for_page_to_load('3000')
+ sel.wait_for_page_to_load('30000')
sel.click('link=%s' % test_package_name)
- sel.wait_for_page_to_load('3000')
+ sel.wait_for_page_to_load('30000')
self.assert_task_correct_v2_0()
def assert_task_correct_v1_1(self):