Exemplo n.º 1
0
def test_ftrbr_integrate_local():
    oriR = utils.Repo(utils.DIR_REPO_BASE)
    cloR = utils.Repo(utils.DIR_REPO_CLONE_FTRBR_INTEGRATE)
    utils.clone_arepo(oriR.dir(), cloR.dir())
    so,se,rc = cloR.exe_cmd_succ('git checkout -b another master')
    so,se,rc = cloR.exe_cmd_succ('git intbr another')
    utils.makebr_edit_commit(cloR)

    so,se,rc = cloR.exe_cmd_succ('git ftrbr-integrate')
    nt.assert_in("Switched to branch 'another'",            se)
    nt.assert_in("Intbr 'another' not tracked, jump pull.", so)
    nt.assert_in("Merging 'ftr/work' into 'another'",       so)
Exemplo n.º 2
0
def test_ftrbr_push_intbr_local():
    oriR, cloR = utils.clone_makebr_edit_commit_repo(utils.DIR_REPO_CLONE_FTRBR_PUSH)

    so, se, rc = cloR.exe_cmd_succ("git checkout -b another master")
    so, se, rc = cloR.exe_cmd_succ("git intbr another")
    utils.makebr_edit_commit(cloR, brname="side_of_another")

    so, se, rc = cloR.exe_cmd_deny("git ftrbr-push")
    nt.eq_("", so)
    nt.assert_in("Integration branch 'another' not tracked", se)
    nt.assert_in("Cannot push.", se)
    nt.assert_not_in("Pushing", so)