Fix use of wrong and undef variable

[thopre]

Summary

Two of the ValueError exceptionsraised in get_base_for_testsuite() refer
to the wrong variable and an undefined variable respectively. This patch
fixes those.

[cmatthews]

LGTM.

[thopre]

Landed as 0d067a27868dae963ac9bc4a21e7da434822dd01

lnt/server/db/migrations/upgrade_0_to_1.py

class Machine(UpdatedBase):
 
         parameters_data = Column("Parameters", Binary, index=False,
                                  unique=False)
 
         class_dict = locals()
         for item in test_suite.machine_fields:
             if item.name in class_dict:
                 raise ValueError("test suite defines reserved key %r" %
-                                 (name,))
+                                 (item.name,))
 
             class_dict[item.name] = item.column = Column(
                 item.name, String(256))
 
     class Order(UpdatedBase):
         __tablename__ = db_key_name + '_Order'
 
         id = Column("ID", Integer, primary_key=True)
class Sample(UpdatedBase):
 
         run = sqlalchemy.orm.relation(Run)
         test = sqlalchemy.orm.relation(Test)
 
         class_dict = locals()
         for item in test_suite.sample_fields:
             if item.name in class_dict:
                 raise ValueError("test suite defines reserved key {}"
-                                 .format(name))
+                                 .format(item.name))
 
             if item.type.name == 'Real':
                 item.column = Column(item.name, Float)
             elif item.type.name == 'Status':
                 item.column = Column(item.name, Integer, ForeignKey(
                         StatusKind.id))
             elif item.type.name == 'Hash':
                 continue