summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/contrib
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-05-14 16:10:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-29 11:59:43 +0100
commite3e85bdf7100cc5619d7f184dc8d9e2a77a03364 (patch)
treea3dcc4abf6973288c0001e7498f8270d6fccdb7e /bitbake/lib/toaster/contrib
parenta5236be47fd62d41eaea2d4b4f1a394de0aac4a9 (diff)
downloadpoky-e3e85bdf7100cc5619d7f184dc8d9e2a77a03364.tar.gz
bitbake: 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] (Bitbake rev: ec43dc569e370767c709dec225cbee0c99151c19) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/contrib')
-rwxr-xr-xbitbake/lib/toaster/contrib/tts/toasteruitest/toaster_automation_test.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_automation_test.py b/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_automation_test.py
index c03a937b89..0cb3934339 100755
--- a/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_automation_test.py
+++ b/bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_automation_test.py
@@ -926,7 +926,7 @@ class toaster_cases(toaster_cases_base):
926 self.driver.find_element_by_id("depends_on").click() 926 self.driver.find_element_by_id("depends_on").click()
927 self.driver.find_element_by_id("layer_version__branch").click() 927 self.driver.find_element_by_id("layer_version__branch").click()
928 self.driver.find_element_by_id("layer_version__layer__commit").click() 928 self.driver.find_element_by_id("layer_version__layer__commit").click()
929 self.driver.find_element_by_id("layer_version__layer__local_path").click() 929 self.driver.find_element_by_id("layer_version__local_path").click()
930 self.driver.find_element_by_id("depends_by").click() 930 self.driver.find_element_by_id("depends_by").click()
931 self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click() 931 self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click()
932 932
@@ -945,7 +945,7 @@ class toaster_cases(toaster_cases_base):
945 945
946 table_head_dict = {'Recipe file':'recipe_file', 'Section':'recipe_section', \ 946 table_head_dict = {'Recipe file':'recipe_file', 'Section':'recipe_section', \
947 'License':'recipe_license', 'Layer':'layer_version__layer__name', \ 947 'License':'recipe_license', 'Layer':'layer_version__layer__name', \
948 'Layer branch':'layer_version__branch', 'Layer directory':'layer_version__layer__local_path'} 948 'Layer branch':'layer_version__branch', 'Layer directory':'layer_version__local_path'}
949 for key in table_head_dict: 949 for key in table_head_dict:
950 self.find_element_by_link_text_in_table(self.table_name, key).click() 950 self.find_element_by_link_text_in_table(self.table_name, key).click()
951 column_list = self.get_table_column_text("class", table_head_dict[key]) 951 column_list = self.get_table_column_text("class", table_head_dict[key])
@@ -1066,7 +1066,7 @@ class toaster_cases(toaster_cases_base):
1066 self.driver.find_element_by_id("depends_on").click() 1066 self.driver.find_element_by_id("depends_on").click()
1067 self.driver.find_element_by_id("layer_version__branch").click() 1067 self.driver.find_element_by_id("layer_version__branch").click()
1068 self.driver.find_element_by_id("layer_version__layer__commit").click() 1068 self.driver.find_element_by_id("layer_version__layer__commit").click()
1069 self.driver.find_element_by_id("layer_version__layer__local_path").click() 1069 self.driver.find_element_by_id("layer_version__local_path").click()
1070 self.driver.find_element_by_id("depends_by").click() 1070 self.driver.find_element_by_id("depends_by").click()
1071 self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click() 1071 self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click()
1072 # check if columns selected above is shown 1072 # check if columns selected above is shown
@@ -1081,7 +1081,7 @@ class toaster_cases(toaster_cases_base):
1081 self.driver.find_element_by_id("depends_on").click() 1081 self.driver.find_element_by_id("depends_on").click()
1082 self.driver.find_element_by_id("layer_version__branch").click() 1082 self.driver.find_element_by_id("layer_version__branch").click()
1083 self.driver.find_element_by_id("layer_version__layer__commit").click() 1083 self.driver.find_element_by_id("layer_version__layer__commit").click()
1084 self.driver.find_element_by_id("layer_version__layer__local_path").click() 1084 self.driver.find_element_by_id("layer_version__local_path").click()
1085 self.driver.find_element_by_id("depends_by").click() 1085 self.driver.find_element_by_id("depends_by").click()
1086 self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click() 1086 self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click()
1087 # don't exist any more 1087 # don't exist any more
@@ -1425,7 +1425,7 @@ class toaster_cases(toaster_cases_base):
1425# Step 4 1425# Step 4
1426 # pulldown menu 1426 # pulldown menu
1427 option_ids = ['recipe__layer_version__layer__name', 'recipe__layer_version__branch', \ 1427 option_ids = ['recipe__layer_version__layer__name', 'recipe__layer_version__branch', \
1428 'recipe__layer_version__layer__commit', 'recipe__layer_version__layer__local_path', \ 1428 'recipe__layer_version__layer__commit', 'recipe__layer_version__local_path', \
1429 'license', 'recipe__version'] 1429 'license', 'recipe__version']
1430 self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click() 1430 self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click()
1431 for item in option_ids: 1431 for item in option_ids:
@@ -1470,7 +1470,7 @@ class toaster_cases(toaster_cases_base):
1470 self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click() 1470 self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click()
1471 self.driver.find_element_by_id("layer_version__branch").click() 1471 self.driver.find_element_by_id("layer_version__branch").click()
1472 self.driver.find_element_by_id("layer_version__layer__commit").click() 1472 self.driver.find_element_by_id("layer_version__layer__commit").click()
1473 self.driver.find_element_by_id("layer_version__layer__local_path").click() 1473 self.driver.find_element_by_id("layer_version__local_path").click()
1474 self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click() 1474 self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click()
1475 # otable is the recipes table here 1475 # otable is the recipes table here
1476 otable_head_text = self.get_table_head_text('otable') 1476 otable_head_text = self.get_table_head_text('otable')
@@ -1488,7 +1488,7 @@ class toaster_cases(toaster_cases_base):
1488 self.driver.find_element_by_id("recipe__layer_version__layer__name").click() 1488 self.driver.find_element_by_id("recipe__layer_version__layer__name").click()
1489 self.driver.find_element_by_id("recipe__layer_version__branch").click() 1489 self.driver.find_element_by_id("recipe__layer_version__branch").click()
1490 self.driver.find_element_by_id("recipe__layer_version__layer__commit").click() 1490 self.driver.find_element_by_id("recipe__layer_version__layer__commit").click()
1491 self.driver.find_element_by_id("recipe__layer_version__layer__local_path").click() 1491 self.driver.find_element_by_id("recipe__layer_version__local_path").click()
1492 self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click() 1492 self.driver.find_element_by_css_selector("button.btn.dropdown-toggle").click()
1493 otable_head_text = self.get_table_head_text("otable") 1493 otable_head_text = self.get_table_head_text("otable")
1494 for item in ["Layer", "Layer branch", "Layer commit", "Layer directory"]: 1494 for item in ["Layer", "Layer branch", "Layer commit", "Layer directory"]: