gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-01 11:18:09 -07:00
Code Issues Projects Releases Wiki Activity

dev-python/flask-migrate: Replace test patch with a simpler hack

Browse Source 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
2022-11-15 19:12:03 +01:00
parent 6f2e180a97
commit e4e3fc0fc3
2 changed files with 12 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
dev-python/flask-migrate/files/flask-migrate-4.0.0-system-venv.patch
View File

@@ -1,174 +0,0 @@
diff --git a/tests/test_custom_template.py b/tests/test_custom_template.py
index fe55fe4..ade8388 100644
--- a/tests/test_custom_template.py
+++ b/tests/test_custom_template.py
@@ -3,12 +3,16 @@ import shutil
import unittest
import subprocess
import shlex
+import sys
-def run_cmd(app, cmd):
- """Run a command and return a tuple with (stdout, stderr, exit_code)"""
+def run_flask(app, cmd):
+ """
+ Run a flask command and return a tuple with (stdout, stderr, exit_code)
+ """
os.environ['FLASK_APP'] = app
- process = subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE,
+ process = subprocess.Popen([sys.executable, '-m', 'flask'] +
+ shlex.split(cmd), stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
(stdout, stderr) = process.communicate()
print('\n$ ' + cmd)
@@ -54,11 +58,11 @@ class TestMigrate(unittest.TestCase):
self.assertTrue(isinstance(v, int))
def test_migrate_upgrade(self):
- (o, e, s) = run_cmd('app.py', 'flask db init -t ./custom_template')
+ (o, e, s) = run_flask('app.py', 'db init -t ./custom_template')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('app.py', 'flask db migrate')
+ (o, e, s) = run_flask('app.py', 'db migrate')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('app.py', 'flask db upgrade')
+ (o, e, s) = run_flask('app.py', 'db upgrade')
self.assertTrue(s == 0)
from .app import app, db, User
diff --git a/tests/test_migrate.py b/tests/test_migrate.py
index 08e60c7..3f22d38 100644
--- a/tests/test_migrate.py
+++ b/tests/test_migrate.py
@@ -3,12 +3,16 @@ import shutil
import unittest
import subprocess
import shlex
+import sys
-def run_cmd(app, cmd):
- """Run a command and return a tuple with (stdout, stderr, exit_code)"""
+def run_flask(app, cmd):
+ """
+ Run a flask command and return a tuple with (stdout, stderr, exit_code)
+ """
os.environ['FLASK_APP'] = app
- process = subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE,
+ process = subprocess.Popen([sys.executable, '-m', 'flask'] +
+ shlex.split(cmd), stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
(stdout, stderr) = process.communicate()
print('\n$ ' + cmd)
@@ -54,11 +58,11 @@ class TestMigrate(unittest.TestCase):
self.assertTrue(isinstance(v, int))
def test_migrate_upgrade(self):
- (o, e, s) = run_cmd('app.py', 'flask db init')
+ (o, e, s) = run_flask('app.py', 'db init')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('app.py', 'flask db migrate')
+ (o, e, s) = run_flask('app.py', 'db migrate')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('app.py', 'flask db upgrade')
+ (o, e, s) = run_flask('app.py', 'db upgrade')
self.assertTrue(s == 0)
from .app import app, db, User
@@ -67,11 +71,11 @@ class TestMigrate(unittest.TestCase):
db.session.commit()
def test_custom_directory(self):
- (o, e, s) = run_cmd('app_custom_directory.py', 'flask db init')
+ (o, e, s) = run_flask('app_custom_directory.py', 'db init')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('app_custom_directory.py', 'flask db migrate')
+ (o, e, s) = run_flask('app_custom_directory.py', 'db migrate')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('app_custom_directory.py', 'flask db upgrade')
+ (o, e, s) = run_flask('app_custom_directory.py', 'db upgrade')
self.assertTrue(s == 0)
from .app_custom_directory import app, db, User
@@ -80,11 +84,11 @@ class TestMigrate(unittest.TestCase):
db.session.commit()
def test_custom_directory_path(self):
- (o, e, s) = run_cmd('app_custom_directory_path.py', 'flask db init')
+ (o, e, s) = run_flask('app_custom_directory_path.py', 'db init')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('app_custom_directory_path.py', 'flask db migrate')
+ (o, e, s) = run_flask('app_custom_directory_path.py', 'db migrate')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('app_custom_directory_path.py', 'flask db upgrade')
+ (o, e, s) = run_flask('app_custom_directory_path.py', 'db upgrade')
self.assertTrue(s == 0)
from .app_custom_directory_path import app, db, User
@@ -93,13 +97,13 @@ class TestMigrate(unittest.TestCase):
db.session.commit()
def test_compare_type(self):
- (o, e, s) = run_cmd('app_compare_type1.py', 'flask database init')
+ (o, e, s) = run_flask('app_compare_type1.py', 'database init')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('app_compare_type1.py', 'flask database migrate')
+ (o, e, s) = run_flask('app_compare_type1.py', 'database migrate')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('app_compare_type1.py', 'flask database upgrade')
+ (o, e, s) = run_flask('app_compare_type1.py', 'database upgrade')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('app_compare_type2.py', 'flask database migrate')
+ (o, e, s) = run_flask('app_compare_type2.py', 'database migrate')
self.assertTrue(s == 0)
self.assertTrue(b'Detected type change from VARCHAR(length=128) '
b'to String(length=10)' in e)
diff --git a/tests/test_multidb_migrate.py b/tests/test_multidb_migrate.py
index 1a40c18..e65106d 100644
--- a/tests/test_multidb_migrate.py
+++ b/tests/test_multidb_migrate.py
@@ -4,12 +4,16 @@ import unittest
import subprocess
import shlex
import sqlite3
+import sys
-def run_cmd(app, cmd):
- """Run a command and return a tuple with (stdout, stderr, exit_code)"""
+def run_flask(app, cmd):
+ """
+ Run a flask command and return a tuple with (stdout, stderr, exit_code)
+ """
os.environ['FLASK_APP'] = app
- process = subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE,
+ process = subprocess.Popen([sys.executable, '-m', 'flask'] +
+ shlex.split(cmd), stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
(stdout, stderr) = process.communicate()
print('\n$ ' + cmd)
@@ -43,11 +47,11 @@ class TestMigrate(unittest.TestCase):
pass
def test_multidb_migrate_upgrade(self):
- (o, e, s) = run_cmd('app_multidb.py', 'flask db init --multidb')
+ (o, e, s) = run_flask('app_multidb.py', 'db init --multidb')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('app_multidb.py', 'flask db migrate')
+ (o, e, s) = run_flask('app_multidb.py', 'db migrate')
self.assertTrue(s == 0)
- (o, e, s) = run_cmd('app_multidb.py', 'flask db upgrade')
+ (o, e, s) = run_flask('app_multidb.py', 'db upgrade')
self.assertTrue(s == 0)
# ensure the tables are in the correct databases
@@ -75,7 +79,7 @@ class TestMigrate(unittest.TestCase):
db.session.commit()
# ensure the downgrade works
- (o, e, s) = run_cmd('app_multidb.py', 'flask db downgrade')
+ (o, e, s) = run_flask('app_multidb.py', 'db downgrade')
self.assertTrue(s == 0)
conn1 = sqlite3.connect('app1.db')

15
dev-python/flask-migrate/flask-migrate-4.0.0.ebuild
View File

@@ -32,6 +32,15 @@ RDEPEND="
distutils_enable_tests unittest
PATCHES=(
"${FILESDIR}"/${P}-system-venv.patch
)
python_test() {
local -x PATH=${T}/bin:${PATH}
mkdir -p "${T}"/bin || die
cat > "${T}"/bin/flask <<-EOF || die
#!/bin/sh
exec ${EPYTHON} -m flask "\${@}"
EOF
chmod +x "${T}"/bin/flask || die
eunittest
}