updating MANIFEST.in, fixing virtualenv tests usage, 2 failed tests

This commit is contained in:
root@fubarite.fubar.si 2010-02-05 03:42:27 +01:00
parent 7912af18ed
commit 4958b12725
4 changed files with 17 additions and 7 deletions

View File

@ -1,3 +1,5 @@
include CHANGELOG
include docs/*.rst
include docs/conf.py
include README
recursive-include docs *
recursive-include migrate *
global-exclude *pyc

View File

@ -16,7 +16,10 @@ class Shell(Pathed):
def setUp(self):
super(Shell, self).setUp()
self.env = TestFileEnvironment(os.path.join(self.temp_usable_dir, 'env'))
self.env = TestFileEnvironment(
base_path=os.path.join(self.temp_usable_dir, 'env'),
script_path=[os.path.dirname(sys.executable)],
)
def run_version(self, repos_path):
result = self.env.run('migrate version %s' % repos_path)

View File

@ -55,11 +55,12 @@ class TestSchemaDiff(fixture.DB):
diff = schemadiff.getDiffOfModelAgainstDatabase(self.meta, self.engine, excludeTables=['migrate_version'])
decls, upgradeCommands, downgradeCommands = genmodel.ModelGenerator(diff).toUpgradeDowngradePython()
self.assertEqualsIgnoreWhitespace(decls, '''
from migrate.changeset import schema
meta = MetaData()
tmp_schemadiff = Table('tmp_schemadiff',meta,
Column('id',Integer(),primary_key=True,nullable=False),
Column('name',UnicodeText(length=None)),
Column('data',UnicodeText(length=None)),
tmp_schemadiff = Table('tmp_schemadiff', meta,
Column('id', Integer(), primary_key=True, nullable=False),
Column('name', UnicodeText(length=None)),
Column('data', UnicodeText(length=None)),
)
''')
self.assertEqualsIgnoreWhitespace(upgradeCommands,

View File

@ -408,6 +408,8 @@ class TestShellDatabase(Shell, DB):
script_text = '''
from sqlalchemy import *
from migrate import *
from migrate.changeset import schema
meta = MetaData(migrate_engine)
account = Table('account', meta,
@ -496,6 +498,8 @@ class TestShellDatabase(Shell, DB):
'''from sqlalchemy import *
from migrate import *
from migrate.changeset import schema
meta = MetaData()
tmp_account_rundiffs = Table('tmp_account_rundiffs', meta,
Column('id', Integer(), primary_key=True, nullable=False),