mirror of
https://github.com/frappe/bench.git
synced 2025-02-13 16:28:32 +00:00
test(init): Run exec_cmd without raise [bug]
This commit is contained in:
parent
b4a6f7fea8
commit
73719a26e2
@ -143,14 +143,15 @@ class TestBenchInit(TestBenchBase):
|
|||||||
# create and install app on site
|
# create and install app on site
|
||||||
self.new_site(site_name, bench_name)
|
self.new_site(site_name, bench_name)
|
||||||
installed_app = not exec_cmd(
|
installed_app = not exec_cmd(
|
||||||
f"bench --site {site_name} install-app {TEST_FRAPPE_APP}", cwd=bench_path
|
f"bench --site {site_name} install-app {TEST_FRAPPE_APP}",
|
||||||
|
cwd=bench_path,
|
||||||
|
_raise=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if installed_app:
|
||||||
app_installed_on_site = subprocess.check_output(
|
app_installed_on_site = subprocess.check_output(
|
||||||
["bench", "--site", site_name, "list-apps"], cwd=bench_path
|
["bench", "--site", site_name, "list-apps"], cwd=bench_path
|
||||||
).decode("utf8")
|
).decode("utf8")
|
||||||
|
|
||||||
if installed_app:
|
|
||||||
self.assertTrue(TEST_FRAPPE_APP in app_installed_on_site)
|
self.assertTrue(TEST_FRAPPE_APP in app_installed_on_site)
|
||||||
|
|
||||||
def test_remove_app(self):
|
def test_remove_app(self):
|
||||||
@ -183,14 +184,18 @@ class TestBenchInit(TestBenchBase):
|
|||||||
prevoius_branch = f"version-{int(FRAPPE_BRANCH.split('-')[1]) - 1}"
|
prevoius_branch = f"version-{int(FRAPPE_BRANCH.split('-')[1]) - 1}"
|
||||||
|
|
||||||
successful_switch = not exec_cmd(
|
successful_switch = not exec_cmd(
|
||||||
f"bench switch-to-branch {prevoius_branch} frappe --upgrade", cwd=bench_path
|
f"bench switch-to-branch {prevoius_branch} frappe --upgrade",
|
||||||
|
cwd=bench_path,
|
||||||
|
_raise=False,
|
||||||
)
|
)
|
||||||
if successful_switch:
|
if successful_switch:
|
||||||
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(prevoius_branch, app_branch_after_switch)
|
self.assertEqual(prevoius_branch, app_branch_after_switch)
|
||||||
|
|
||||||
successful_switch = not exec_cmd(
|
successful_switch = not exec_cmd(
|
||||||
f"bench switch-to-branch {FRAPPE_BRANCH} frappe --upgrade", cwd=bench_path
|
f"bench switch-to-branch {FRAPPE_BRANCH} frappe --upgrade",
|
||||||
|
cwd=bench_path,
|
||||||
|
_raise=False,
|
||||||
)
|
)
|
||||||
if successful_switch:
|
if successful_switch:
|
||||||
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)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user