accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-11-17 02:25:16 +00:00
Code Issues Releases Activity

Merge branch 'develop' of github.com:Aradhya-Tripathi/bench into dependency-resolution

Browse Source
This commit is contained in:
Aradhya 2022-02-07 12:38:18 +05:30
commit 6c9fb2d9f9
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bench/tests/test_base.py
View File

@ -14,10 +14,14 @@ from bench.utils import paths_in_bench, exec_cmd
from bench.utils.system import init from bench.utils.system import init
from bench.bench import Bench from bench.bench import Bench
if sys.version_info.major == 2: PYTHON_VER = sys.version_info
FRAPPE_BRANCH = "version-12"
else: FRAPPE_BRANCH = "version-12"
FRAPPE_BRANCH = "develop" if PYTHON_VER.major == 3:
if PYTHON_VER.minor in [6, 7]:
FRAPPE_BRANCH = "version-13"
else:
FRAPPE_BRANCH = "develop"
class TestBenchBase(unittest.TestCase): class TestBenchBase(unittest.TestCase):
def setUp(self): def setUp(self):

14
bench/tests/test_init.py
View File

@ -151,15 +151,21 @@ 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")
successful_switch = not exec_cmd("bench switch-to-branch version-13 frappe --upgrade", cwd=bench_path) # * chore: change to 14 when avalible
prevoius_branch = "version-13"
if FRAPPE_BRANCH != "develop":
# assuming we follow `version-#`
prevoius_branch = f"version-{int(FRAPPE_BRANCH.split('-')[1]) - 1}"
successful_switch = not exec_cmd(f"bench switch-to-branch {prevoius_branch} 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)
if successful_switch: if successful_switch:
self.assertEqual("version-13", app_branch_after_switch) self.assertEqual(prevoius_branch, app_branch_after_switch)
successful_switch = not exec_cmd("bench switch-to-branch develop frappe --upgrade", cwd=bench_path) successful_switch = not exec_cmd(f"bench switch-to-branch {FRAPPE_BRANCH} 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)
if successful_switch: if successful_switch:
self.assertEqual("develop", app_branch_after_second_switch) self.assertEqual(FRAPPE_BRANCH, app_branch_after_second_switch)
if __name__ == '__main__': if __name__ == '__main__':