accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-09-23 20:49:01 +00:00
Code Issues Releases Activity

chore(tests): drop PY2 testing for frappe > v12

Browse Source
This commit is contained in:
Gavin D'souza 2020-05-11 15:59:44 +05:30
parent 2a58598f34
commit c30afb0284
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bench/tests/test_base.py
View File

@ -11,6 +11,14 @@ import getpass
import bench import bench
import bench.utils import bench.utils
# imports - third party imports
from six import PY2
if PY2:
FRAPPE_BRANCH = "version-12"
else:
FRAPPE_BRANCH = "develop"
class TestBenchBase(unittest.TestCase): class TestBenchBase(unittest.TestCase):
def setUp(self): def setUp(self):
@ -76,7 +84,7 @@ class TestBenchBase(unittest.TestCase):
frappe_tmp_path = "/tmp/frappe" frappe_tmp_path = "/tmp/frappe"
if not os.path.exists(frappe_tmp_path): if not os.path.exists(frappe_tmp_path):
bench.utils.exec_cmd("git clone https://github.com/frappe/frappe --depth 1 --origin upstream {location}".format(location=frappe_tmp_path)) bench.utils.exec_cmd("git clone https://github.com/frappe/frappe -b {branch} --depth 1 --origin upstream {location}".format(branch=FRAPPE_BRANCH, location=frappe_tmp_path))
kwargs.update(dict( kwargs.update(dict(
python=sys.executable, python=sys.executable,

4
bench/tests/test_init.py
View File

@ -134,11 +134,11 @@ class TestBenchInit(TestBenchBase):
bench_path = os.path.join(self.benches_path, "test-bench") bench_path = os.path.join(self.benches_path, "test-bench")
app_path = os.path.join(bench_path, "apps", "frappe") app_path = os.path.join(bench_path, "apps", "frappe")
bench.utils.exec_cmd("bench switch-to-branch version-12 frappe", cwd=bench_path) bench.utils.exec_cmd("bench switch-to-branch version-12 frappe --upgrade", cwd=bench_path)
app_branch_after_switch = str(git.Repo(path=app_path).active_branch) app_branch_after_switch = str(git.Repo(path=app_path).active_branch)
self.assertEqual("version-12", app_branch_after_switch) self.assertEqual("version-12", app_branch_after_switch)
bench.utils.exec_cmd("bench switch-to-branch develop frappe", cwd=bench_path) bench.utils.exec_cmd("bench switch-to-branch develop frappe --upgrade", cwd=bench_path)
app_branch_after_second_switch = str(git.Repo(path=app_path).active_branch) app_branch_after_second_switch = str(git.Repo(path=app_path).active_branch)
self.assertEqual("develop", app_branch_after_second_switch) self.assertEqual("develop", app_branch_after_second_switch)