diff options
3 files changed, 19 insertions, 47 deletions
diff --git a/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_test.cfg b/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_test.cfg index 6405f9a8ef7..1edecd76509 100644 --- a/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_test.cfg +++ b/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_test.cfg @@ -8,7 +8,7 @@ [toaster_test_linux] toaster_url = 'http://127.0.0.1:8000' test_browser = 'firefox' -test_cases = [946] +test_cases = [1069] logging_level = 'INFO' diff --git a/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_tests/toaster_pages.py b/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_tests/toaster_pages.py index ef08791bb5b..91b81f3807e 100644 --- a/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_tests/toaster_pages.py +++ b/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_tests/toaster_pages.py @@ -479,19 +479,16 @@ class ProjectPage(ToasterPage): bb_variables_option=PageElement(link_text="Bitbake variables") project_builds_option=PageElement(class_name="total-builds") import_layer_option=PageElement(link_text="Import layer") - import_layer_box=PageElement(id="import-layer-name") - import_git_repo_box=PageElement(id="layer-git-repo-url") - import_subdir_box=PageElement(id="layer-subdir") - import_revision_box=PageElement(id="layer-git-ref") - import_add_button=PageElement(id="import-and-add-btn") - build_input_box=PageElement(id="build-input") - build_button_option=PageElement(id="build-button") - release_change_option=PageElement(id="release-change-toggle") - release_change_form=PageElement(id="change-release-form") - release_change_button=PageElement(id="change-release-btn") - machine_change_option=PageElement(id="change-machine-toggle") - machine_change_box=PageElement(id="machine-change-input") - machine_change_button=PageElement(id="machine-change-btn") + import_layer_box=PageElement(id_="import-layer-name") + import_git_repo_box=PageElement(id_="layer-git-repo-url") + import_subdir_box=PageElement(id_="layer-subdir") + import_revision_box=PageElement(id_="layer-git-ref") + import_add_button=PageElement(id_="import-and-add-btn") + build_input_box=PageElement(id_="build-input") + build_button_option=PageElement(id_="build-button") + machine_change_option=PageElement(id_="change-machine-toggle") + machine_change_box=PageElement(id_="machine-change-input") + machine_change_button=PageElement(id_="machine-change-btn") def select_layers_option(self): self.layers_option.click() @@ -513,11 +510,6 @@ class ProjectPage(ToasterPage): self.configuration_option.click() return ProjectPage(self.w) - def change_release(self, release): - self.relese_change_option.click() - self.release_change_form.send_keys(release) - self.release_change_button.click() - def change_machine(self, machine): self.machine_change_option.click() self.machine_change_box.send_keys(machine) @@ -533,11 +525,11 @@ class ProjectPage(ToasterPage): class LayersPage(ProjectPage): - default_columns = ['Layer', 'Summary', 'Revision', 'Dependencies', 'Add/Delete'] + default_columns = ['Layer', 'Summary', 'Git revision', 'Dependencies', 'Add | Remove'] default_layers = ['meta-yocto-bsp', 'meta-yocto', 'openembedded-core'] default_revision = 'HEAD' - search_text_field = PageElement(id="search-input-layerstable") - search_submit_button = PageElement(id="search-submit-layerstable") + search_text_field = PageElement(id_="search-input-layerstable") + search_submit_button = PageElement(id_="search-submit-layerstable") column_classes = {'Layer':'layer__name'} def display_all_layers_columns(self): @@ -545,6 +537,7 @@ class LayersPage(ProjectPage): def search_for_layer(self, search_string): self.search_text_field.clear() - self.search_text_field.sendkeys(search_string) + self.search_text_field.send_keys(search_string) self.search_submit_button.click() -
\ No newline at end of file + time.sleep(1) + diff --git a/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_tests/toaster_tests.py b/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_tests/toaster_tests.py index f2ed13e387b..0c35df1aa4e 100644 --- a/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_tests/toaster_tests.py +++ b/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_tests/toaster_tests.py @@ -318,6 +318,7 @@ class ToasterTests(BaseToasterTestCase): #step 2 self.log_test_step_number(2) layer_page = project_page.select_layers_option() + time.sleep(1) #step 3-5 self.log_test_step_number(3) @@ -327,17 +328,12 @@ class ToasterTests(BaseToasterTestCase): self.log_test_step_number(5) layer_page.is_text_present(layer_page.default_revision) - #Change project release to "yocto master" to access more options - layer_page.select_config_option() - project_page.change_release("Yocto Project master") - project_page.change_release("Local Yocto Project") - #step 6 layer_page.display_all_layers_columns() self.log_test_step_number(6) layer_page.search_for_layer("meta-yocto-bsp") layer_page.is_text_present("meta-yocto-bsp") - layer_page.is_text_present("master") + layer_page.is_text_present("HEAD") #step 7 #step 7 cannot be automated at this time @@ -347,20 +343,3 @@ class ToasterTests(BaseToasterTestCase): self.log_test_step_number(8) layer_page.is_text_present('github') - ############### - # CASE 1070 # - ############### - def test_1070(self): - #step 1 - self.log_test_step_number(1) - self.toaster_driver.go_to_base_url() - home_page = toaster_pages.HomePage(self.toaster_driver.driver) - project_page = home_page.select_selenium_project() - - #step 2 - self.log_test_step_number(2) - layer_page = project_page.select_layers_option() - - #step 3 - list = get_table_values_in_column_nr(column_classes['Layer']) -
\ No newline at end of file |