diff options
author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2015-05-14 16:10:50 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-29 11:58:25 +0100 |
commit | ec43dc569e370767c709dec225cbee0c99151c19 (patch) | |
tree | 9262b0c478c7bca67745f1ca0446dfb0d2c7f73f /lib/toaster/contrib/tts/toasteruitest | |
parent | ba10b6f89767c0dad8a2b064f42a84956764e9da (diff) | |
download | bitbake-ec43dc569e370767c709dec225cbee0c99151c19.tar.gz |
toaster logger: refactor recipe and layer file paths
This refactoring brings the "local_path" of the
layer from the Layer object to the Layer_Version object, which
is more appropriate as different checkouts of the same
Layer may live in different directories.
This enables us to store Recipe file paths relative to a Layer_Version
at all times, aleviating the need to store full file paths in the
database. We also turn the prefix of the path (e.g. virtual:native
path name space) into a pathflag field.
In turn, this solves the problem of mis-identification of tasks based
on the recipe file paths, since we can also match the namespace of the
file paths on the recipe files.
[YOCTO #7594]
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Diffstat (limited to 'lib/toaster/contrib/tts/toasteruitest')
-rwxr-xr-x | lib/toaster/contrib/tts/toasteruitest/toaster_automation_test.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/toaster/contrib/tts/toasteruitest/toaster_automation_test.py b/lib/toaster/contrib/tts/toasteruitest/toaster_automation_test.py index c03a937b8..0cb393433 100755 --- a/lib/toaster/contrib/tts/toasteruitest/toaster_automation_test.py +++ b/lib/toaster/contrib/tts/toasteruitest/toaster_automation_test.py @@ -926,7 +926,7 @@ class toaster_cases(toaster_cases_base): self.driver.find_element_by_id("depends_on").click() self.driver.find_element_by_id("layer_version__branch").click() self.driver.find_element_by_id("layer_version__layer__commit").click() - self.driver.find_element_by_id("layer_version__layer__local_path").click() + self.driver.find_element_by_id("layer_version__local_path").click() self.driver.find_element_by_id("depends_by").click() self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click() @@ -945,7 +945,7 @@ class toaster_cases(toaster_cases_base): table_head_dict = {'Recipe file':'recipe_file', 'Section':'recipe_section', \ 'License':'recipe_license', 'Layer':'layer_version__layer__name', \ - 'Layer branch':'layer_version__branch', 'Layer directory':'layer_version__layer__local_path'} + 'Layer branch':'layer_version__branch', 'Layer directory':'layer_version__local_path'} for key in table_head_dict: self.find_element_by_link_text_in_table(self.table_name, key).click() column_list = self.get_table_column_text("class", table_head_dict[key]) @@ -1066,7 +1066,7 @@ class toaster_cases(toaster_cases_base): self.driver.find_element_by_id("depends_on").click() self.driver.find_element_by_id("layer_version__branch").click() self.driver.find_element_by_id("layer_version__layer__commit").click() - self.driver.find_element_by_id("layer_version__layer__local_path").click() + self.driver.find_element_by_id("layer_version__local_path").click() self.driver.find_element_by_id("depends_by").click() self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click() # check if columns selected above is shown @@ -1081,7 +1081,7 @@ class toaster_cases(toaster_cases_base): self.driver.find_element_by_id("depends_on").click() self.driver.find_element_by_id("layer_version__branch").click() self.driver.find_element_by_id("layer_version__layer__commit").click() - self.driver.find_element_by_id("layer_version__layer__local_path").click() + self.driver.find_element_by_id("layer_version__local_path").click() self.driver.find_element_by_id("depends_by").click() self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click() # don't exist any more @@ -1425,7 +1425,7 @@ class toaster_cases(toaster_cases_base): # Step 4 # pulldown menu option_ids = ['recipe__layer_version__layer__name', 'recipe__layer_version__branch', \ - 'recipe__layer_version__layer__commit', 'recipe__layer_version__layer__local_path', \ + 'recipe__layer_version__layer__commit', 'recipe__layer_version__local_path', \ 'license', 'recipe__version'] self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click() for item in option_ids: @@ -1470,7 +1470,7 @@ class toaster_cases(toaster_cases_base): self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click() self.driver.find_element_by_id("layer_version__branch").click() self.driver.find_element_by_id("layer_version__layer__commit").click() - self.driver.find_element_by_id("layer_version__layer__local_path").click() + self.driver.find_element_by_id("layer_version__local_path").click() self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click() # otable is the recipes table here otable_head_text = self.get_table_head_text('otable') @@ -1488,7 +1488,7 @@ class toaster_cases(toaster_cases_base): self.driver.find_element_by_id("recipe__layer_version__layer__name").click() self.driver.find_element_by_id("recipe__layer_version__branch").click() self.driver.find_element_by_id("recipe__layer_version__layer__commit").click() - self.driver.find_element_by_id("recipe__layer_version__layer__local_path").click() + self.driver.find_element_by_id("recipe__layer_version__local_path").click() self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click() otable_head_text = self.get_table_head_text("otable") for item in ["Layer", "Layer branch", "Layer commit", "Layer directory"]: |