[OE-core] [PATCH 2/2] oeqa/selftest/_toaster.py: fix 'IndentationError' issues

Ionut Chisanovici ionutx.chisanovici at intel.com
Mon Jun 30 08:41:39 UTC 2014


There were some indentation errors when the _toaster.py was merged into master.
This patch fix those errors.

Signed-off-by: Ionut Chisanovici <ionutx.chisanovici at intel.com>
---
 meta/lib/oeqa/selftest/_toaster.py | 560 ++++++++++++++++++-------------------
 1 file changed, 280 insertions(+), 280 deletions(-)

diff --git a/meta/lib/oeqa/selftest/_toaster.py b/meta/lib/oeqa/selftest/_toaster.py
index 4ab6cbf..5a42e93 100644
--- a/meta/lib/oeqa/selftest/_toaster.py
+++ b/meta/lib/oeqa/selftest/_toaster.py
@@ -18,82 +18,82 @@ from orm.models import *
 class ToasterSetup(oeSelfTest):
 
     def recipe_parse(self, file_path, var):
-    for line in open(file_path,'r'):
-        if line.find(var) > -1:
-        val = line.split(" = ")[1].replace("\"", "").strip()
-        return val
+	for line in open(file_path,'r'):
+	    if line.find(var) > -1:
+		val = line.split(" = ")[1].replace("\"", "").strip()
+		return val
 
     def fix_file_path(self, file_path):
-    if ":" in file_path:
-        file_path=file_path.split(":")[2]
-    return file_path
+	if ":" in file_path:
+	    file_path=file_path.split(":")[2]
+	return file_path
 
 class Toaster_DB_Tests(ToasterSetup):
 
     # Check if build name is unique - tc_id=795
     def test_Build_Unique_Name_TC795(self):
-    all_builds = Build.objects.all().count()
-    distinct_builds = Build.objects.values('id').distinct().count()
-    self.assertEqual(distinct_builds, all_builds, msg = 'Build name is not unique')
+	all_builds = Build.objects.all().count()
+	distinct_builds = Build.objects.values('id').distinct().count()
+	self.assertEqual(distinct_builds, all_builds, msg = 'Build name is not unique')
 
-    # Check if build cooker log path is unique - tc_id=819
+    # Check if build coocker log path is unique - tc_id=819
     def test_Build_Unique_Cooker_Log_Path_TC819(self):
-    distinct_path = Build.objects.values('cooker_log_path').distinct().count()
-    total_builds = Build.objects.values('id').count()
-    self.assertEqual(distinct_path, total_builds, msg = 'Build cooker log path is not unique')
+	distinct_path = Build.objects.values('cooker_log_path').distinct().count()
+	total_builds = Build.objects.values('id').count()
+	self.assertEqual(distinct_path, total_builds, msg = 'Build coocker log path is not unique')
 
     # Check if the number of errors matches the number of orm_logmessage.level entries with value 2 - tc_id=820
     def test_Build_Errors_No_TC820(self):
-    builds = Build.objects.values('id', 'errors_no')
-    cnt_err = []
-    for build in builds:
-        log_mess_err_no = LogMessage.objects.filter(build = build['id'], level = 2).count()
-        if (build['errors_no'] != log_mess_err_no):
-        cnt_err.append(build['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' % cnt_err)
+	builds = Build.objects.values('id', 'errors_no')
+	cnt_err = []
+	for build in builds:
+	    log_mess_err_no = LogMessage.objects.filter(build = build['id'], level = 2).count()
+	    if (build['errors_no'] != log_mess_err_no):
+		cnt_err.append(build['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' % cnt_err)
 
     # Check if the number of warnings matches the number of orm_logmessage.level entries with value 1 - tc=821
     def test_Build_Warnings_No_TC821(self):
-    builds = Build.objects.values('id', 'warnings_no')
-    cnt_err = []
-    for build in builds:
-        log_mess_warn_no = LogMessage.objects.filter(build = build['id'], level = 1).count()
-        if (build['warnings_no'] != log_mess_warn_no):
-        cnt_err.append(build['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' % cnt_err)
+	builds = Build.objects.values('id', 'warnings_no')
+	cnt_err = []
+	for build in builds:
+	    log_mess_warn_no = LogMessage.objects.filter(build = build['id'], level = 1).count()
+	    if (build['warnings_no'] != log_mess_warn_no):
+		cnt_err.append(build['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' % cnt_err)
 
     # Check if the build succeeded then the errors_no is 0 - tc_id=822
     def test_Build_Suceeded_Errors_No_TC822(self):
-    builds = Build.objects.filter(outcome = 0).values('id', 'errors_no')
-    cnt_err = []
-    for build in builds:
-        if (build['errors_no'] != 0):
-        cnt_err.append(build['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' % cnt_err)
-
-    # Check if task order is unique for one build - tc=824
+	builds = Build.objects.filter(outcome = 0).values('id', 'errors_no')
+	cnt_err = []
+	for build in builds:
+	    if (build['errors_no'] != 0):
+		cnt_err.append(build['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' % cnt_err)
+
+    # Check if task order is unique for one build - tc=824	
     def test_Task_Unique_Order_TC824(self):
-    builds = builds = Build.objects.values('id')
-    cnt_err = []
-    for build in builds:
-        total_task_order = Task.objects.filter(build = build['id']).values('order').count()
-        distinct_task_order = Task.objects.filter(build = build['id']).values('order').distinct().count()
-        if (total_task_order != distinct_task_order):
-        cnt_err.append(build['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' % cnt_err)
+	builds = Build.objects.values('id')
+	cnt_err = []
+	for build in builds:
+	    total_task_order = Task.objects.filter(build = build['id']).values('order').count()
+	    distinct_task_order = Task.objects.filter(build = build['id']).values('order').distinct().count()
+	    if (total_task_order != distinct_task_order):
+		cnt_err.append(build['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' % cnt_err)
 
     # Check task order sequence for one build - tc=825
     def test_Task_Order_Sequence_TC825(self):
-    builds = builds = Build.objects.values('id')
-    cnt_err = []
-    for build in builds:
-        tasks = Task.objects.filter(Q(build = build['id']), ~Q(order = None), ~Q(task_name__contains = '_setscene')).values('id', 'order').order_by("order")
-        cnt_tasks = 0
-        for task in tasks:
-        cnt_tasks += 1
-        if (task['order'] != cnt_tasks):
-            cnt_err.append(task['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err)
+	builds = builds = Build.objects.values('id')
+	cnt_err = []
+	for build in builds:
+	    tasks = Task.objects.filter(Q(build = build['id']), ~Q(order = None), ~Q(task_name__contains = '_setscene')).values('id', 'order').order_by("order")
+	    cnt_tasks = 0
+	    for task in tasks:
+		cnt_tasks += 1
+		if (task['order'] != cnt_tasks):
+		    cnt_err.append(task['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err)
 
     # Check if disk_io matches the difference between EndTimeIO and StartTimeIO in build stats - tc=828
     ### this needs to be updated ###
@@ -101,311 +101,311 @@ class Toaster_DB_Tests(ToasterSetup):
 
     # Check if outcome = 2 (SSTATE) then sstate_result must be 3 (RESTORED) - tc=832
     def test_Task_If_Outcome_2_Sstate_Result_Must_Be_3_TC832(self):
-    tasks = Task.objects.filter(outcome = 2).values('id', 'sstate_result')
-    cnt_err = []
-    for task in tasks:
-        if (row['sstate_result'] != 3):
-        cnt_err.append(task['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err)
+	tasks = Task.objects.filter(outcome = 2).values('id', 'sstate_result')
+	cnt_err = []
+	for task in tasks:
+	    if (row['sstate_result'] != 3):
+		cnt_err.append(task['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err)
 
     # Check if outcome = 1 (COVERED) or 3 (EXISTING) then sstate_result must be 0 (SSTATE_NA) - tc=833
     def test_Task_If_Outcome_1_3_Sstate_Result_Must_Be_0_TC833(self):
-    tasks = Task.objects.filter(outcome__in = (1, 3)).values('id', 'sstate_result')
-    cnt_err = []
-    for task in tasks:
-        if (task['sstate_result'] != 0):
-        cnt_err.append(task['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err)
+	tasks = Task.objects.filter(outcome__in = (1, 3)).values('id', 'sstate_result')
+	cnt_err = []
+	for task in tasks:
+	    if (task['sstate_result'] != 0):
+		cnt_err.append(task['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err)
 
     # Check if outcome is 0 (SUCCESS) or 4 (FAILED) then sstate_result must be 0 (NA), 1 (MISS) or 2 (FAILED) - tc=834
     def test_Task_If_Outcome_0_4_Sstate_Result_Must_Be_0_1_2_TC834(self):
-    tasks = Task.objects.filter(outcome__in = (0, 4)).values('id', 'sstate_result')
-    cnt_err = []
-    for task in tasks:
-        if (task['sstate_result'] not in [0, 1, 2]):
-        cnt_err.append(task['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err)
+	tasks = Task.objects.filter(outcome__in = (0, 4)).values('id', 'sstate_result')
+	cnt_err = []
+	for task in tasks:
+	    if (task['sstate_result'] not in [0, 1, 2]):
+		cnt_err.append(task['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err)
 
     # Check if task_executed = TRUE (1), script_type must be 0 (CODING_NA), 2 (CODING_PYTHON), 3 (CODING_SHELL) - tc=891
     def test_Task_If_Task_Executed_True_Script_Type_0_2_3_TC891(self):
-    tasks = Task.objects.filter(task_executed = 1).values('id', 'script_type')
-    cnt_err = []
-    for task in tasks:
-        if (task['script_type'] not in [0, 2, 3]):
-        cnt_err.append(task['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err)
+	tasks = Task.objects.filter(task_executed = 1).values('id', 'script_type')
+	cnt_err = []
+	for task in tasks:
+	    if (task['script_type'] not in [0, 2, 3]):
+		cnt_err.append(task['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err)
 
     # Check if task_executed = TRUE (1), outcome must be 0 (SUCCESS) or 4 (FAILED) - tc=836
     def test_Task_If_Task_Executed_True_Outcome_0_4_TC836(self):
-    tasks = Task.objects.filter(task_executed = 1).values('id', 'outcome')
-    cnt_err = []
-    for task in tasks:
-        if (task['outcome'] not in [0, 4]):
-        cnt_err.append(task['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err)
+	tasks = Task.objects.filter(task_executed = 1).values('id', 'outcome')
+	cnt_err = []
+	for task in tasks:
+	    if (task['outcome'] not in [0, 4]):
+		cnt_err.append(task['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err)
 
     # Check if task_executed = FALSE (0), script_type must be 0 - tc=890
     def test_Task_If_Task_Executed_False_Script_Type_0_TC890(self):
-    tasks = Task.objects.filter(task_executed = 0).values('id', 'script_type')
-    cnt_err = []
-    for task in tasks:
-        if (task['script_type'] != 0):
-        cnt_err.append(task['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err)
+	tasks = Task.objects.filter(task_executed = 0).values('id', 'script_type')
+	cnt_err = []
+	for task in tasks:
+	    if (task['script_type'] != 0):
+		cnt_err.append(task['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err)
 
     # Check if task_executed = FALSE (0) and build outcome = SUCCEEDED (0), task outcome must be 1 (COVERED), 2 (CACHED), 3 (PREBUILT), 5 (EMPTY) - tc=837
     def test_Task_If_Task_Executed_False_Outcome_1_2_3_5_TC837(self):
-    builds = Build.objects.filter(outcome = 0).values('id')
-    cnt_err = []
-    for build in builds:
-        tasks = Task.objects.filter(build = build['id'], task_executed = 0).values('id', 'outcome')
-        for task in tasks:
-        if (task['outcome'] not in [1, 2, 3, 5]):
-            cnt_err.append(task['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err)
+	builds = Build.objects.filter(outcome = 0).values('id')
+	cnt_err = []
+	for build in builds:
+	    tasks = Task.objects.filter(build = build['id'], task_executed = 0).values('id', 'outcome')
+	    for task in tasks:
+		if (task['outcome'] not in [1, 2, 3, 5]):
+		    cnt_err.append(task['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err)
 
     # Key verification - tc=888
     def test_Target_Installed_Package_TC888(self):
-    rows = Target_Installed_Package.objects.values('id', 'target_id', 'package_id')
-    cnt_err = []
-    for row in rows:
-        target = Target.objects.filter(id = row['target_id']).values('id')
-        package = Package.objects.filter(id = row['package_id']).values('id')
-        if (not target or not package):
-        cnt_err.append(row['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for target installed package id: %s' % cnt_err)
+	rows = Target_Installed_Package.objects.values('id', 'target_id', 'package_id')
+	cnt_err = []
+	for row in rows:
+	    target = Target.objects.filter(id = row['target_id']).values('id')
+	    package = Package.objects.filter(id = row['package_id']).values('id')
+	    if (not target or not package):
+		cnt_err.append(row['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for target installed package id: %s' % cnt_err)
 
     # Key verification - tc=889
     def test_Task_Dependency_TC889(self):
-    rows = Task_Dependency.objects.values('id', 'task_id', 'depends_on_id')
-    cnt_err = []
-    for row in rows:
-        task_id = Task.objects.filter(id = row['task_id']).values('id')
-        depends_on_id = Task.objects.filter(id = row['depends_on_id']).values('id')
-        if (not task_id or not depends_on_id):
-        cnt_err.append(row['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for task dependency id: %s' % cnt_err)
+	rows = Task_Dependency.objects.values('id', 'task_id', 'depends_on_id')
+	cnt_err = []
+	for row in rows:
+	    task_id = Task.objects.filter(id = row['task_id']).values('id')
+	    depends_on_id = Task.objects.filter(id = row['depends_on_id']).values('id')
+	    if (not task_id or not depends_on_id):
+		cnt_err.append(row['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for task dependency id: %s' % cnt_err)
 
     # Check if build target file_name is populated only if is_image=true AND orm_build.outcome=0 then if the file exists and its size matches the file_size value
     ### Need to add the tc in the test run
     def test_Target_File_Name_Populated(self):
-    builds = Build.objects.filter(outcome = 0).values('id')
-    cnt_err = []
-    for build in builds:
-        targets = Target.objects.filter(build_id = build['id'], is_image = 1).values('id')
-        for target in targets:
-        target_files = Target_Image_File.objects.filter(target_id = target['id']).values('id', 'file_name', 'file_size')
-        for file_info in target_files:
-            target_id = file_info['id']
-            target_file_name = file_info['file_name']
-            target_file_size = file_info['file_size']
-            if (not target_file_name or not target_file_size):
-            cnt_err.append(target_id)
-            else:
-            if (not os.path.exists(target_file_name)):
-                cnt_err.append(target_id)
-            else:
-                if (os.path.getsize(target_file_name) != target_file_size):
-                cnt_err.append(target_id)
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for target image file id: %s' % cnt_err)
+	builds = Build.objects.filter(outcome = 0).values('id')
+	for build in builds:
+	    targets = Target.objects.filter(build_id = build['id'], is_image = 1).values('id')
+	    for target in targets:
+		target_files = Target_Image_File.objects.filter(target_id = target['id']).values('id', 'file_name', 'file_size')
+		cnt_err = []
+		for file_info in target_files:
+		    target_id = file_info['id']
+		    target_file_name = file_info['file_name']
+		    target_file_size = file_info['file_size']
+		    if (not target_file_name or not target_file_size):
+			cnt_err.append(target_id)
+		    else:
+			if (not os.path.exists(target_file_name)):
+			    cnt_err.append(target_id)
+			else:
+			    if (os.path.getsize(target_file_name) != target_file_size):
+				cnt_err.append(target_id)
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for target image file id: %s' % cnt_err)
 
     # Key verification - tc=884
     def test_Package_Dependency_TC884(self):
-    cnt_err = []
-    deps = Package_Dependency.objects.values('id', 'package_id', 'depends_on_id')
-    for dep in deps:
-        if (dep['package_id'] == dep['depends_on_id']):
-        cnt_err.append(dep['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for package dependency id: %s' % cnt_err)
+	cnt_err = []
+	deps = Package_Dependency.objects.values('id', 'package_id', 'depends_on_id')
+	for dep in deps:
+	    if (dep['package_id'] == dep['depends_on_id']):
+		cnt_err.append(dep['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for package dependency id: %s' % cnt_err)
 
     # Check if recipe name does not start with a number (0-9) - tc=838
     def test_Recipe_Name_TC838(self):
-    recipes = Recipe.objects.values('id', 'name')
-    cnt_err = []
-    for recipe in recipes:
-        if (recipe['name'][0].isdigit() is True):
-        cnt_err.append(recipe['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err)
+	recipes = Recipe.objects.values('id', 'name')
+	cnt_err = []
+	for recipe in recipes:
+	    if (recipe['name'][0].isdigit() is True):
+		cnt_err.append(recipe['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err)
 
     # Check if recipe section matches the content of the SECTION variable (if set) in file_path - tc=839
     def test_Recipe_DB_Section_Match_Recipe_File_Section_TC839(self):
-    recipes = Recipe.objects.values('id', 'section', 'file_path')
-    cnt_err = []
-    for recipe in recipes:
-        file_path = self.fix_file_path(recipe['file_path'])
-        file_exists = os.path.isfile(file_path)
-        if (not file_path or (file_exists is False)):
-        cnt_err.append(recipe['id'])
-        else:
-        file_section = self.recipe_parse(file_path, "SECTION = ")
-        db_section = recipe['section']
-        if file_section:
-            if (db_section != file_section):
-            cnt_err.append(recipe['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err)
+	recipes = Recipe.objects.values('id', 'section', 'file_path')
+	cnt_err = []
+	for recipe in recipes:
+	    file_path = self.fix_file_path(recipe['file_path'])
+	    file_exists = os.path.isfile(file_path)
+	    if (not file_path or (file_exists is False)):
+		cnt_err.append(recipe['id'])
+	    else:
+		file_section = self.recipe_parse(file_path, "SECTION = ")
+		db_section = recipe['section']
+		if file_section:
+		    if (db_section != file_section):
+			cnt_err.append(recipe['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err)
 
     # Check if recipe license matches the content of the LICENSE variable (if set) in file_path - tc=840
     def test_Recipe_DB_License_Match_Recipe_File_License_TC840(self):
-    recipes = Recipe.objects.values('id', 'license', 'file_path')
-    cnt_err = []
-    for recipe in recipes:
-        file_path = self.fix_file_path(recipe['file_path'])
-        file_exists = os.path.isfile(file_path)
-        if (not file_path or (file_exists is False)):
-        cnt_err.append(recipe['id'])
-        else:
-        file_license = self.recipe_parse(file_path, "LICENSE = ")
-        db_license = recipe['license']
-        if file_license:
-            if (db_license != file_license):
-            cnt_err.append(recipe['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err)
+	recipes = Recipe.objects.values('id', 'license', 'file_path')
+	cnt_err = []
+	for recipe in recipes:
+	    file_path = self.fix_file_path(recipe['file_path'])
+	    file_exists = os.path.isfile(file_path)
+	    if (not file_path or (file_exists is False)):
+		cnt_err.append(recipe['id'])
+	    else:
+		file_license = self.recipe_parse(file_path, "LICENSE = ")
+		db_license = recipe['license']
+		if file_license:
+		    if (db_license != file_license):
+			cnt_err.append(recipe['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err)
 
     # Check if recipe homepage matches the content of the HOMEPAGE variable (if set) in file_path - tc=841
     def test_Recipe_DB_Homepage_Match_Recipe_File_Homepage_TC841(self):
-    recipes = Recipe.objects.values('id', 'homepage', 'file_path')
-    cnt_err = []
-    for recipe in recipes:
-        file_path = self.fix_file_path(recipe['file_path'])
-        file_exists = os.path.isfile(file_path)
-        if (not file_path or (file_exists is False)):
-        cnt_err.append(recipe['id'])
-        else:
-        file_homepage = self.recipe_parse(file_path, "HOMEPAGE = ")
-        db_homepage = recipe['homepage']
-        if file_homepage:
-            if (db_homepage != file_homepage):
-            cnt_err.append(recipe['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err)
+	recipes = Recipe.objects.values('id', 'homepage', 'file_path')
+	cnt_err = []
+	for recipe in recipes:
+	    file_path = self.fix_file_path(recipe['file_path'])
+	    file_exists = os.path.isfile(file_path)
+	    if (not file_path or (file_exists is False)):
+		cnt_err.append(recipe['id'])
+	    else:
+		file_homepage = self.recipe_parse(file_path, "HOMEPAGE = ")
+		db_homepage = recipe['homepage']
+		if file_homepage:
+		    if (db_homepage != file_homepage):
+			cnt_err.append(recipe['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err)
 
     # Check if recipe bugtracker matches the content of the BUGTRACKER variable (if set) in file_path - tc=842
     def test_Recipe_DB_Bugtracker_Match_Recipe_File_Bugtracker_TC842(self):
-    recipes = Recipe.objects.values('id', 'bugtracker', 'file_path')
-    cnt_err = []
-    for recipe in recipes:
-        file_path = self.fix_file_path(recipe['file_path'])
-        file_exists = os.path.isfile(file_path)
-        if (not file_path or (file_exists is False)):
-        cnt_err.append(recipe['id'])
-        else:
-        file_bugtracker = self.recipe_parse(file_path, "BUGTRACKER = ")
-        db_bugtracker = recipe['bugtracker']
-        if file_bugtracker:
-            if (db_bugtracker != file_bugtracker):
-            cnt_err.append(recipe['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err)
+	recipes = Recipe.objects.values('id', 'bugtracker', 'file_path')
+	cnt_err = []
+	for recipe in recipes:
+	    file_path = self.fix_file_path(recipe['file_path'])
+	    file_exists = os.path.isfile(file_path)
+	    if (not file_path or (file_exists is False)):
+		cnt_err.append(recipe['id'])
+	    else:
+		file_bugtracker = self.recipe_parse(file_path, "BUGTRACKER = ")
+		db_bugtracker = recipe['bugtracker']
+		if file_bugtracker:
+		    if (db_bugtracker != file_bugtracker):
+			cnt_err.append(recipe['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err)
 
     # Recipe key verification, recipe name does not depends on a recipe having the same name - tc=883
     def test_Recipe_Dependency_TC883(self):
-    deps = Recipe_Dependency.objects.values('id', 'recipe_id', 'depends_on_id')
-    cnt_err = []
-    for dep in deps:
-        if (not dep['recipe_id'] or not dep['depends_on_id']):
-        cnt_err.append(dep['id'])
-        else:
-        name = Recipe.objects.filter(id = dep['recipe_id']).values('name')
-        dep_name = Recipe.objects.filter(id = dep['depends_on_id']).values('name')
-        if (name == dep_name):
-            cnt_err.append(dep['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe dependency id: %s' % cnt_err)
+	deps = Recipe_Dependency.objects.values('id', 'recipe_id', 'depends_on_id')
+	cnt_err = []
+	for dep in deps:
+	    if (not dep['recipe_id'] or not dep['depends_on_id']):
+		cnt_err.append(dep['id'])
+	    else:
+		name = Recipe.objects.filter(id = dep['recipe_id']).values('name')
+		dep_name = Recipe.objects.filter(id = dep['depends_on_id']).values('name')
+		if (name == dep_name):
+		    cnt_err.append(dep['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe dependency id: %s' % cnt_err)
 
     # Check if package name does not start with a number (0-9) - tc=846
     def test_Package_Name_For_Number_TC846(self):
-    packages = Package.objects.filter(~Q(size = -1)).values('id', 'name')
-    cnt_err = []
-    for package in packages:
-        if (package['name'][0].isdigit() is True):
-        cnt_err.append(package['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err)
+	packages = Package.objects.filter(~Q(size = -1)).values('id', 'name')
+	cnt_err = []
+	for package in packages:
+	    if (package['name'][0].isdigit() is True):
+		cnt_err.append(package['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err)
 
     # Check if package version starts with a number (0-9) - tc=847
     def test_Package_Version_Starts_With_Number_TC847(self):
-    packages = Package.objects.filter(~Q(size = -1)).values('id', 'version')
-    cnt_err = []
-    for package in packages:
-        if (package['version'][0].isdigit() is False):
-        cnt_err.append(package['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err)
+	packages = Package.objects.filter(~Q(size = -1)).values('id', 'version')
+	cnt_err = []
+	for package in packages:
+	    if (package['version'][0].isdigit() is False):
+		cnt_err.append(package['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err)
 
     # Check if package revision starts with 'r' - tc=848
     def test_Package_Revision_Starts_With_r_TC848(self):
-    packages = Package.objects.filter(~Q(size = -1)).values('id', 'revision')
-    cnt_err = []
-    for package in packages:
-        if (package['revision'][0].startswith("r") is False):
-        cnt_err.append(package['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err)
+	packages = Package.objects.filter(~Q(size = -1)).values('id', 'revision')
+	cnt_err = []
+	for package in packages:
+	    if (package['revision'][0].startswith("r") is False):
+		cnt_err.append(package['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err)
 
     # Check the validity of the package build_id
     ### TC must be added in test run
     def test_Package_Build_Id(self):
-    packages = Package.objects.filter(~Q(size = -1)).values('id', 'build_id')
-    cnt_err = []
-    for package in packages:
-        build_id = Build.objects.filter(id = package['build_id']).values('id')
-        if (not build_id):
-        cnt_err.append(package['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err)
+	packages = Package.objects.filter(~Q(size = -1)).values('id', 'build_id')
+	cnt_err = []
+	for package in packages:
+	    build_id = Build.objects.filter(id = package['build_id']).values('id')
+	    if (not build_id):
+		cnt_err.append(package['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err)
 
     # Check the validity of package recipe_id
     ### TC must be added in test run
     def test_Package_Recipe_Id(self):
-    packages = Package.objects.filter(~Q(size = -1)).values('id', 'recipe_id')
-    cnt_err = []
-    for package in packages:
-        recipe_id = Recipe.objects.filter(id = package['recipe_id']).values('id')
-        if (not recipe_id):
-        cnt_err.append(package['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err)
+	packages = Package.objects.filter(~Q(size = -1)).values('id', 'recipe_id')
+	cnt_err = []
+	for package in packages:
+	    recipe_id = Recipe.objects.filter(id = package['recipe_id']).values('id')
+	    if (not recipe_id):
+		cnt_err.append(package['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err)
 
     # Check if package installed_size field is not null
     ### TC must be aded in test run
     def test_Package_Installed_Size_Not_NULL(self):
-    packages = Package.objects.filter(installed_size__isnull = True).values('id')
-    cnt_err = []
-    for package in packages:
-        cnt_err.append(package['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err)
+	packages = Package.objects.filter(installed_size__isnull = True).values('id')
+	cnt_err = []
+	for package in packages:
+	    cnt_err.append(package['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err)
 
     # Check if all layers requests return exit code is 200 - tc=843
     def test_Layers_Requests_Exit_Code_TC843(self):
-    layers = Layer.objects.values('id', 'layer_index_url')
-    cnt_err = []
-    for layer in layers:
-        resp = urllib.urlopen(layer['layer_index_url'])
-        if (resp.getcode() != 200):
-        cnt_err.append(layer['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for layer id: %s' % cnt_err)
+	layers = Layer.objects.values('id', 'layer_index_url')
+	cnt_err = []
+	for layer in layers:
+	    resp = urllib.urlopen(layer['layer_index_url'])
+	    if (resp.getcode() != 200):
+		cnt_err.append(layer['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for layer id: %s' % cnt_err)
 
     # Check if the output of bitbake-layers show_layers matches the info from database - tc=895
     def test_Layers_Show_Layers_TC895(self):
-    layers = Layer.objects.values('id', 'name', 'local_path')
-    cmd = commands.getoutput('bitbake-layers show_layers')
-    cnt_err = []
-    for layer in layers:
-        if (layer['name'] or layer['local_path']) not in cmd:
-        cnt_err.append(layer['id'])
-    self.assertEqual(len(cnt_err), 0, msg = 'Errors for layer id: %s' % cnt_err)
+	layers = Layer.objects.values('id', 'name', 'local_path')
+	cmd = commands.getoutput('bitbake-layers show_layers')
+	cnt_err = []
+	for layer in layers:
+	    if (layer['name'] or layer['local_path']) not in cmd:
+		cnt_err.append(layer['id'])
+	self.assertEqual(len(cnt_err), 0, msg = 'Errors for layer id: %s' % cnt_err)
 
     # Check if django server starts regardless of the timezone set on the machine - tc=905
     def test_Start_Django_Timezone_TC905(self):
         current_path = os.getcwd()
-    zonefilelist = []
+	zonefilelist = []
         ZONEINFOPATH = '/usr/share/zoneinfo/'
-    os.chdir("../bitbake/lib/toaster/")
-    cnt_err = 0
-    for filename in os.listdir(ZONEINFOPATH):
-        if os.path.isfile(os.path.join(ZONEINFOPATH, filename)):
-        zonefilelist.append(filename)
-    for k in range(len(zonefilelist)):
-        if k <= 5:
-        files = zonefilelist[k]
-        os.system("export TZ="+str(files)+"; python manage.py runserver > /dev/null 2>&1 &")
-            time.sleep(3)
-        pid = subprocess.check_output("ps aux | grep '[/u]sr/bin/python manage.py runserver' | awk '{print $2}'", shell = True)
-        if pid:
-            os.system("kill -9 "+str(pid))
-        else:
-            cnt_err.append(zonefilelist[k])
-    self.assertEqual(cnt_err, 0, msg = 'Errors django server does not start with timezone: %s' % cnt_err)
+	os.chdir("../bitbake/lib/toaster/")
+	cnt_err = 0
+	for filename in os.listdir(ZONEINFOPATH):
+	    if os.path.isfile(os.path.join(ZONEINFOPATH, filename)):
+		zonefilelist.append(filename)
+	for k in range(len(zonefilelist)):
+	    if k <= 5:
+		files = zonefilelist[k]
+		os.system("export TZ="+str(files)+"; python manage.py runserver > /dev/null 2>&1 &")
+    		time.sleep(3)
+		pid = subprocess.check_output("ps aux | grep '[/u]sr/bin/python manage.py runserver' | awk '{print $2}'", shell = True)
+		if pid:
+		    os.system("kill -9 "+str(pid))
+		else:
+		    cnt_err.append(zonefilelist[k])
+	self.assertEqual(cnt_err, 0, msg = 'Errors django server does not start with timezone: %s' % cnt_err)
         os.chdir(current_path)
-- 
1.8.3.2




More information about the Openembedded-core mailing list