Fix under and over continuation indentation

[thopre]

Summary

Fix Flake8 E127 and E128 errors (under and over continuation
indentation)

lnt/lnttool/viewcomparison.py

try:
 
         # Create the database.
         lnt.server.db.migrate.update_path(db_path)
 
         # Import the two reports.
         with contextlib.closing(config.get_database('default')) as db:
             session = db.make_session()
             import_and_report(config, 'default', db, session, report_a,
-                                  '<auto>', testsuite, select_machine='match')
             import_and_report(config, 'default', db, session, report_b,
                               '<auto>', testsuite, select_machine='match')
 
             # Dispatch another thread to start the webbrowser.
             comparison_url = '%s/v4/nts/2?compare_to=1' % (url,)
             logger.info("opening comparison view: %s" % (comparison_url,))
 
             if not dry_run:

lnt/server/db/testsuitedb.py

def __init__(self, v4db, name, test_suite):
         self.name = name
         self.test_suite = test_suite
 
         # Save caches of the various fields.
         self.machine_fields = list(self.test_suite.machine_fields)
         self.order_fields = list(self.test_suite.order_fields)
         self.run_fields = list(self.test_suite.run_fields)
         self.sample_fields = list(sorted(self.test_suite.sample_fields,
                                          key = lambda s: s.schema_index))
         self.machine_to_latest_order_cache = {}
         sample_field_indexes = dict()
 
         for i, field in enumerate(self.sample_fields):
             sample_field_indexes[field.name] = i
         self.sample_field_indexes = sample_field_indexes
 
         self.base = sqlalchemy.ext.declarative.declarative_base()

lnt/server/reporting/latestrunsreport.py

def build(self, session):
 
         machines = session.query(ts.Machine).all()
 
         self.result_table = []
         for field in self.fields:
             field_results = []
             for machine in machines:
                 machine_results = []
-                machine_runs = list(reversed(session.query(ts.Run)
+                machine_runs = list(reversed(
+                    session.query(ts.Run)
                     .filter(ts.Run.machine_id == machine.id)
                     .order_by(ts.Run.start_time.desc())
                     .limit(self.run_count)
                     .all()))
 
                 if len(machine_runs) < 2:
                     continue
 
                 machine_runs_ids = [r.id for r in machine_runs]
 
                 # take all tests from latest run and do a comparison
                 oldest_run = machine_runs[0]
 
-                run_tests = session.query(ts.Test) \
-                        .join(ts.Sample) \
-                        .join(ts.Run) \
-                        .filter(ts.Sample.run_id == oldest_run.id) \
-                        .filter(ts.Sample.test_id == ts.Test.id) \
-                        .all()
+                run_tests = (session.query(ts.Test)
+                             .join(ts.Sample)
+                             .join(ts.Run)
+                             .filter(ts.Sample.run_id == oldest_run.id)
+                             .filter(ts.Sample.test_id == ts.Test.id)
+                             .all())
 
                 # Create a run info object.
                 sri = lnt.server.reporting.analysis.RunInfo(session, ts, machine_runs_ids)
 
                 # Build the result table of tests with interesting results.
                 def compute_visible_results_priority(visible_results):
                     # We just use an ad hoc priority that favors showing tests with
                     # failures and large changes. We do this by computing the priority

lnt/server/reporting/report.py

 
 # Compute static CSS styles for elements. We use the style directly on
 # elements instead of via a stylesheet to support major email clients
 # (like Gmail) which can't deal with embedded style sheets.
 # These are derived from the static style.css file we use elsewhere.
 
 report_css_styles = {
         "body": ("color:#000000; background-color:#ffffff; "
                  "font-family: Helvetica, sans-serif; font-size:9pt"),
         "table": ("font-size:9pt; border-spacing: 0px; "
                   "border: 1px solid black"),
         "th": (
             "background-color:#eee; color:#666666; font-weight: bold; "
             "cursor: default; text-align:center; font-weight: bold; "
             "font-family: Verdana; padding:5px; padding-left:8px"),
         "td": "padding:5px; padding-left:8px",
         "right": "text-align: right;"
         }

lnt/server/ui/regression_views.py

def v4_new_regressions():
     form = TriagePageSelectedForm(request.form)
     session = request.session
     ts = request.get_testsuite()
     if request.method == 'POST' and \
             request.form['btn'] == "Create New Regression":
         regression, _ = new_regression(session, ts, form.field_changes.data)
         flash("Created " + regression.title, FLASH_SUCCESS)
         return v4_redirect(v4_url_for(".v4_regression_list",
                                       highlight=regression.id))
     if request.method == 'POST' and request.form['btn'] == "Ignore Changes":
         msg = "Ignoring changes: "
         ignored = []
         for fc_id in form.field_changes.data:
             ignored.append(str(fc_id))
             fc = get_fieldchange(session, ts, fc_id)
             ignored_change = ts.ChangeIgnore(fc)
             session.add(ignored_change)
if request.method == 'POST' and \
         links = []
         target = 0
         for i, r in enumerate(regressions):
             if r.bug:
                 target = i
                 links.append(r.bug)
 
         new_regress, _ = new_regression(session, ts,
                                         [x.field_change_id for x in reg_inds])
         new_regress.state = regressions[target].state
         new_regress.title = regressions[target].title
         new_regress.bug = ' '.join(links)
         for r in regressions:
             r.bug = v4_url_for(".v4_regression_detail", id=new_regress.id)
             r.title = "Merged into Regression " + str(new_regress.id)
             r.state = RegressionState.IGNORED
         [session.delete(x) for x in reg_inds]
except NoResultFound as e:
         abort(404)
     if request.method == 'POST' and request.form['save_btn'] == "Save Changes":
         regression_info.title = form.title.data
         regression_info.bug = form.bug.data
         regression_info.state = form.state.data
         session.commit()
         flash("Updated " + regression_info.title, FLASH_SUCCESS)
         return v4_redirect(v4_url_for(".v4_regression_list",
                                       highlight=regression_info.id,
                                       state=int(form.edit_state.data)))
     if request.method == 'POST' and \
             request.form['save_btn'] == "Split Regression":
         # For each of the regression indicators, grab their field ids.
         res_inds = session.query(ts.RegressionIndicator) \
             .filter(ts.RegressionIndicator.field_change_id.in_(
                 form.field_changes.data)) \
             .all()
         fc_ids = [x.field_change_id for x in res_inds]
         second_regression, _ = new_regression(session, ts, fc_ids)
         second_regression.state = regression_info.state
 
         # Now remove our links to this regression.
         for res_ind in res_inds:
             session.delete(res_ind)
         lnt.server.db.fieldchange.rebuild_title(session, ts, regression_info)
         session.commit()
         flash("Split " + second_regression.title, FLASH_SUCCESS)
         return v4_redirect(v4_url_for(".v4_regression_list",
                                       highlight=second_regression.id,
                                       state=int(form.edit_state.data)))
     if request.method == 'POST' and request.form['save_btn'] == "Delete":
         # For each of the regression indicators, grab their field ids.
         title = regression_info.title
         res_inds = session.query(ts.RegressionIndicator) \
             .filter(
                 ts.RegressionIndicator.regression_id == regression_info.id) \
             .all()
         # Now remove our links to this regression.
         for res_ind in res_inds:
             session.delete(res_ind)
         session.delete(regression_info)
         session.commit()
         flash("Deleted " + title, FLASH_SUCCESS)
         return v4_redirect(v4_url_for(".v4_regression_list",
                                       state=int(form.edit_state.data)))
     form.field_changes.choices = list()
     form.state.default = regression_info.state
     form.process()
     form.edit_state.data = regression_info.state
     form.title.data = regression_info.title
     form.bug.data = regression_info.bug
     regression_indicators = session.query(ts.RegressionIndicator) \
         .filter(ts.RegressionIndicator.regression_id == id) \

lnt/server/ui/views.py

machine_1_run = session.query(ts.Run) \
         .first()
 
     machine_2_run = session.query(ts.Run) \
         .filter(ts.Run.machine_id == machine_compare_to_id) \
         .order_by(ts.Run.start_time.desc()) \
         .first()
 
     return v4_redirect(v4_url_for('.v4_run', id=machine_1_run.id,
                                   compare_to=machine_2_run.id))
 
 
 @v4_route("/machine/<int:id>")
 def v4_machine(id):
 
     # Compute the list of associated runs, grouped by order.
 
     # Gather all the runs on this machine.
def simple_run(tag, id):
     # Look for a matched run.
     matched_run = session.query(ts.Run).\
         filter(ts.Run.simple_run_id == id).\
         first()
 
     # If we found one, redirect to it's report.
     if matched_run is not None:
         return v4_redirect(db_url_for(".v4_run", testsuite_name=tag,
                                       id=matched_run.id))
 
     # Otherwise, report an error.
     return render_template("error.html", message="""\
 Unable to find a run for this ID. Please use the native v4 URL interface
 (instead of the /simple/... URL schema).""")
 
 
 @v4_route("/<int:id>")
else:
         date = datetime.date.today()
 
     extra_args = request.args.copy()
     extra_args.pop("year", None)
     extra_args.pop("month", None)
     extra_args.pop("day", None)
 
     return v4_redirect(v4_url_for(".v4_daily_report",
-                               year=date.year, month=date.month, day=date.day,
-                               **extra_args))
+                                  year=date.year, month=date.month,
+                                  day=date.day, **extra_args))
 
 
 @v4_route("/daily_report/<int:year>/<int:month>/<int:day>")
 def v4_daily_report(year, month, day):
     num_days_str = request.args.get('num_days')
     if num_days_str is not None:
         num_days = int(num_days_str)
     else:

lnt/tests/nt.py

def run_test(self, opts):
         # Multisample, if requested.
         merge_run = None
         if opts.multisample is not None:
             # Collect the sample reports.
             reports = []
 
             for i in range(opts.multisample):
                 print("%s: (multisample) running iteration %d" %\
-                        (timestamp(), i), file=sys.stderr)
                 report = run_test(opts.label, i, config)
                 reports.append(report)
 
             # Create the merged report.
             #
             # FIXME: Do a more robust job of merging the reports?
             print("%s: (multisample) creating merged report" % (
                 timestamp(), ), file=sys.stderr)

tests/server/db/ImportV4TestSuiteInstance.py

 assert run_a.imported_from.endswith("sample-a-small.plist")
 assert run_b.imported_from.endswith("sample-b-small.plist")
 assert run_a.start_time == datetime.datetime(2009, 11, 17, 2, 12, 25)
 assert run_a.end_time == datetime.datetime(2009, 11, 17, 3, 44, 48)
 assert sorted(run_a.parameters.items()) == [('inferred_run_order', '1')]
 assert sorted(run_b.parameters.items()) == [('inferred_run_order', '2')]
 
 # Validate the samples.
-samples = list(session.query(ts.Sample)\
-    .join(ts.Run) \
+samples = list(session.query(ts.Sample)
+               .join(ts.Run)
                .order_by(ts.Run.order_id, ts.Sample.id))
 assert len(samples) == 3
 sample_a_0, sample_a_1, sample_b = samples
 assert sample_a_0.run is run_a
 assert sample_a_1.run is run_a
 assert sample_b.run is run_b
 assert sample_a_0.test is test
 assert sample_a_1.test is test
 assert sample_b.test is test

tests/testing/cPerf.py

 # RUN: python %s
 
 import unittest
 import sys
 import os
 import tempfile
 from lnt.testing.profile.perf import LinuxPerfProfile
 
 
 class CPerfTest(unittest.TestCase):
     def setUp(self):
         self.inputs = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                                    'Inputs')
         self.fake_nm = 'python %s/fake-nm.py' % self.inputs
 
-        self.expected_data = {'fib-aarch64': {u'counters': {u'cycles': 240949386},
-                 u'functions': {u'fib': {u'counters': {u'cycles': 99.77243187496647},
-                                         u'data': [[{u'cycles': 22.476272172208624},
-                                                    4196040,
-                                                    u'\ta9be4ff4 \tstp\tx20, x19, [sp,#-32]!'],
-                                                   [{u'cycles': 20.81533649797271},
-                                                    4196044,
-                                                    u'\ta9017bfd \tstp\tx29, x30, [sp,#16]'],
-                                                   [{},
-                                                    4196048,
-                                                    u'\t910043fd \tadd\tx29, sp, #0x10'],
-                                                   [{},
-                                                    4196052,
-                                                    u'\t71000813 \tsubs\tw19, w0, #0x2'],
-                                                   [{},
-                                                    4196056,
-                                                    u'\t540000eb \tb.lt\t4006f4 <fib+0x2c>'],
-                                                   [{u'cycles': 10.065491723992467},
-                                                    4196060,
-                                                    u'\t51000400 \tsub\tw0, w0, #0x1'],
-                                                   [{},
-                                                    4196064,
-                                                    u'\t97fffffa \tbl\t4006c8 <fib>'],
-                                                   [{u'cycles': 5.858831022967777},
-                                                    4196068,
-                                                    u'\t2a0003f4 \tmov\tw20, w0'],
-                                                   [{},
-                                                    4196072,
-                                                    u'\t2a1303e0 \tmov\tw0, w19'],
-                                                   [{},
-                                                    4196076,
-                                                    u'\t97fffff7 \tbl\t4006c8 <fib>'],
-                                                   [{u'cycles': 7.57924022814841},
-                                                    4196080,
-                                                    u'\t0b140000 \tadd\tw0, w0, w20'],
-                                                   [{u'cycles': 19.240308514111305},
-                                                    4196084,
-                                                    u'\ta9417bfd \tldp\tx29, x30, [sp,#16]'],
-                                                   [{u'cycles': 13.964519840598708},
-                                                    4196088,
-                                                    u'\ta8c24ff4 \tldp\tx20, x19, [sp],#32'],
-                                                   [{},
-                                                    4196092,
-                                                    u'\td65f03c0 \tret']]}}},
- 'fib2-aarch64': {u'counters': {u'branch-misses': 1820692,
-                                u'cache-misses': 33054,
-                                u'cycles': 243618286},
-                  u'functions': {u'fib': {u'counters': {u'branch-misses': 99.7405382129432,
-                                                        u'cache-misses': 75.18000847098688,
-                                                        u'cycles': 99.78902404723429},
-                                          u'data': [[{u'branch-misses': 21.904846340904687,
-                                                      u'cache-misses': 37.4486921529175,
-                                                      u'cycles': 23.48637833693693},
-                                                     4196040,
-                                                     u'\ta9be4ff4 \tstp\tx20, x19, [sp,#-32]!'],
-                                                    [{u'branch-misses': 2.6443747907452115,
-                                                      u'cache-misses': 17.08651911468813,
-                                                      u'cycles': 20.34001001463117},
-                                                     4196044,
-                                                     u'\ta9017bfd \tstp\tx29, x30, [sp,#16]'],
-                                                    [{},
-                                                     4196048,
-                                                     u'\t910043fd \tadd\tx29, sp, #0x10'],
-                                                    [{},
-                                                     4196052,
-                                                     u'\t71000813 \tsubs\tw19, w0, #0x2'],
-                                                    [{},
-                                                     4196056,
-                                                     u'\t540000eb \tb.lt\t4006f4 <fib+0x2c>'],
-                                                    [{u'branch-misses': 30.264575146698622,
-                                                      u'cache-misses': 20.69215291750503,
-                                                      u'cycles': 9.787981545863996},
-                                                     4196060,
-                                                     u'\t51000400 \tsub\tw0, w0, #0x1'],
-                                                    [{},
-                                                     4196064,
-                                                     u'\t97fffffa \tbl\t4006c8 <fib>'],
-                                                    [{u'branch-misses': 0.11195131191739062,
-                                                      u'cache-misses': 2.3621730382293764,
-                                                      u'cycles': 7.702120542412432},
-                                                     4196068,
-                                                     u'\t2a0003f4 \tmov\tw20, w0'],
-                                                    [{},
-                                                     4196072,
-                                                     u'\t2a1303e0 \tmov\tw0, w19'],
-                                                    [{},
-                                                     4196076,
-                                                     u'\t97fffff7 \tbl\t4006c8 <fib>'],
-                                                    [{u'branch-misses': 19.03265916580028,
-                                                      u'cache-misses': 3.8229376257545273,
-                                                      u'cycles': 7.362266427937867},
-                                                     4196080,
-                                                     u'\t0b140000 \tadd\tw0, w0, w20'],
-                                                    [{u'branch-misses': 4.9891297644011345,
-                                                      u'cache-misses': 7.553319919517103,
-                                                      u'cycles': 18.387547715628735},
-                                                     4196084,
-                                                     u'\ta9417bfd \tldp\tx29, x30, [sp,#16]'],
-                                                    [{u'branch-misses': 21.05246347953268,
-                                                      u'cache-misses': 11.03420523138833,
-                                                      u'cycles': 12.93369541658887},
-                                                     4196088,
-                                                     u'\ta8c24ff4 \tldp\tx20, x19, [sp],#32'],
-                                                    [{},
-                                                     4196092,
-                                                     u'\td65f03c0 \tret']]}}}}
+        self.expected_data = {
+            "fib-aarch64": {
+                u"counters": {u"cycles": 240949386},
+                u"functions": {
+                    u"fib": {
+                        u"counters": {u"cycles": 99.77243187496647},
+                        u"data": [
+                            [
+                                {u"cycles": 22.476272172208624},
+                                u"\ta9be4ff4 \tstp\tx20, x19, [sp,#-32]!",
+                            ],
+                            [
+                                {u"cycles": 20.81533649797271},
+                                u"\ta9017bfd \tstp\tx29, x30, [sp,#16]",
+                            ],
+                            [{}, 4196048, u"\t910043fd \tadd\tx29, sp, #0x10"],
+                            [{}, 4196052, u"\t71000813 \tsubs\tw19, w0, #0x2"],
+                            [{}, 4196056, u"\t540000eb \tb.lt\t4006f4 <fib+0x2c>"],
+                            [
+                                {u"cycles": 10.065491723992467},
+                                u"\t51000400 \tsub\tw0, w0, #0x1",
+                            ],
+                            [{}, 4196064, u"\t97fffffa \tbl\t4006c8 <fib>"],
+                            [
+                                {u"cycles": 5.858831022967777},
+                                u"\t2a0003f4 \tmov\tw20, w0",
+                            ],
+                            [{}, 4196072, u"\t2a1303e0 \tmov\tw0, w19"],
+                            [{}, 4196076, u"\t97fffff7 \tbl\t4006c8 <fib>"],
+                            [
+                                {u"cycles": 7.57924022814841},
+                                u"\t0b140000 \tadd\tw0, w0, w20",
+                            ],
+                            [
+                                {u"cycles": 19.240308514111305},
+                                u"\ta9417bfd \tldp\tx29, x30, [sp,#16]",
+                            ],
+                            [
+                                {u"cycles": 13.964519840598708},
+                                u"\ta8c24ff4 \tldp\tx20, x19, [sp],#32",
+                            ],
+                            [{}, 4196092, u"\td65f03c0 \tret"],
+                        ],
+                    }
+                },
+            },
+            "fib2-aarch64": {
+                u"counters": {
+                    u"branch-misses": 1820692,
+                    u"cache-misses": 33054,
+                    u"cycles": 243618286,
+                },
+                u"functions": {
+                    u"fib": {
+                        u"counters": {
+                            u"branch-misses": 99.7405382129432,
+                            u"cache-misses": 75.18000847098688,
+                            u"cycles": 99.78902404723429,
+                        },
+                        u"data": [
+                            [
+                                {
+                                    u"branch-misses": 21.904846340904687,
+                                    u"cache-misses": 37.4486921529175,
+                                    u"cycles": 23.48637833693693,
+                                },
+                                u"\ta9be4ff4 \tstp\tx20, x19, [sp,#-32]!",
+                            ],
+                            [
+                                {
+                                    u"branch-misses": 2.6443747907452115,
+                                    u"cache-misses": 17.08651911468813,
+                                    u"cycles": 20.34001001463117,
+                                },
+                                u"\ta9017bfd \tstp\tx29, x30, [sp,#16]",
+                            ],
+                            [{}, 4196048, u"\t910043fd \tadd\tx29, sp, #0x10"],
+                            [{}, 4196052, u"\t71000813 \tsubs\tw19, w0, #0x2"],
+                            [{}, 4196056, u"\t540000eb \tb.lt\t4006f4 <fib+0x2c>"],
+                            [
+                                {
+                                    u"branch-misses": 30.264575146698622,
+                                    u"cache-misses": 20.69215291750503,
+                                    u"cycles": 9.787981545863996,
+                                },
+                                u"\t51000400 \tsub\tw0, w0, #0x1",
+                            ],
+                            [{}, 4196064, u"\t97fffffa \tbl\t4006c8 <fib>"],
+                            [
+                                {
+                                    u"branch-misses": 0.11195131191739062,
+                                    u"cache-misses": 2.3621730382293764,
+                                    u"cycles": 7.702120542412432,
+                                },
+                                u"\t2a0003f4 \tmov\tw20, w0",
+                            ],
+                            [{}, 4196072, u"\t2a1303e0 \tmov\tw0, w19"],
+                            [{}, 4196076, u"\t97fffff7 \tbl\t4006c8 <fib>"],
+                            [
+                                {
+                                    u"branch-misses": 19.03265916580028,
+                                    u"cache-misses": 3.8229376257545273,
+                                    u"cycles": 7.362266427937867,
+                                },
+                                u"\t0b140000 \tadd\tw0, w0, w20",
+                            ],
+                            [
+                                {
+                                    u"branch-misses": 4.9891297644011345,
+                                    u"cache-misses": 7.553319919517103,
+                                    u"cycles": 18.387547715628735,
+                                },
+                                u"\ta9417bfd \tldp\tx29, x30, [sp,#16]",
+                            ],
+                            [
+                                {
+                                    u"branch-misses": 21.05246347953268,
+                                    u"cache-misses": 11.03420523138833,
+                                    u"cycles": 12.93369541658887,
+                                },
+                                u"\ta8c24ff4 \tldp\tx20, x19, [sp],#32",
+                            ],
+                            [{}, 4196092, u"\td65f03c0 \tret"],
+                        ],
+                    }
+                },
+            },
+        }
 
     def _getNm(self, perf_data_fname, non_dynamic=False):
         stub = perf_data_fname.rsplit('.perf_data', 1)[0]
         s = 'python %s/fake-nm.py %s.nm.out' % (self.inputs, stub)
         if non_dynamic:
             s += ' --fake-nm-be-non-dynamic'
         return s