def test_intbr_get():
oriR = utils.Repo(utils.DIR_REPO_BASE)
cloR = utils.Repo(utils.DIR_REPO_CLONE_INTBR)
utils.clone_arepo(oriR.dir(), cloR.dir())
so,se,rc = cloR.exe_cmd_deny('git intbr')
nt.eq_(so, '')
def test_ftrbr_start_intbr_tracked_prefix_set():
oriR = utils.Repo(utils.DIR_REPO_BASE)
cloR = utils.Repo(utils.DIR_REPO_CLONE_FTRBR)
utils.clone_arepo(oriR.dir(), cloR.dir())
so,se,rc = cloR.exe_cmd_succ('git intbr master')
so,se,rc = cloR.exe_cmd('git config --local %s ftr/' % utils.CFG_FTR_PREFIX )
so,se,rc = cloR.exe_cmd_succ('git ftrbr-start aaa')
nt.assert_in("Pulling 'master'", so)
nt.assert_in("Creating new ftr branch", so)
nt.assert_in("Switched to a new branch 'ftr/aaa'", se)
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)
def test_ftrbr_start_intbr_onlylocal():
oriR = utils.Repo(utils.DIR_REPO_BASE)
cloR = utils.Repo(utils.DIR_REPO_CLONE_FTRBR)
utils.clone_arepo(oriR.dir(), cloR.dir())
so,se,rc = cloR.exe_cmd_succ('git checkout -b onlylocal master')
so,se,rc = cloR.exe_cmd_succ('git intbr onlylocal')
#should skip pull
so,se,rc = cloR.exe_cmd_succ('git ftrbr-start aaa')
nt.assert_in("Intbr 'onlylocal' not tracked, jump pull.", so)
nt.assert_in("Creating new ftr branch starting from 'onlylocal'", so)
nt.assert_in("Switched to a new branch 'aaa'", se)
def test_intbr_set():
oriR = utils.Repo(utils.DIR_REPO_BASE)
cloR = utils.Repo(utils.DIR_REPO_CLONE_INTBR)
utils.clone_arepo(oriR.dir(), cloR.dir())
so,se,rc = cloR.exe_cmd_succ('git intbr master')
nt.eq_(so, '')
so,se,rc = cloR.exe_cmd_succ('git intbr')
nt.eq_(so, 'master')
so,se,rc = cloR.exe_cmd_succ('git config --get 4f.intbr')
nt.eq_(so, 'master')
def test_intbr_unset_different():
oriR = utils.Repo(utils.DIR_REPO_BASE)
cloR = utils.Repo(utils.DIR_REPO_CLONE_INTBR)
utils.clone_arepo(oriR.dir(), cloR.dir())
so,se,rc = cloR.exe_cmd_succ('git intbr master')
so,se,rc = cloR.exe_cmd_succ('git intbr-unset')
so,se,rc = cloR.exe_cmd_deny('git intbr')
nt.eq_(so, '')
nt.eq_(se, 'Integration branch not set')
so,se,rc = cloR.exe_cmd_deny('git config --get 4f.intbr')
nt.eq_(so, '')
nt.eq_(se, '')
def test_ftrbr_start_conflict():
oriR = utils.Repo(utils.DIR_REPO_BASE)
cloR = utils.Repo(utils.DIR_REPO_CLONE_FTRBR)
utils.clone_arepo(oriR.dir(), cloR.dir())
utils.edit_commit(oriR, 'on origin')
so,se,rc = cloR.exe_cmd_succ('git checkout master')
utils.edit_commit(cloR, 'on clone')
so,se,rc = cloR.exe_cmd_succ('git intbr master')
so,se,rc = cloR.exe_cmd_deny('git ftrbr-start aaa')
nt.assert_in("Pulling 'master'", so)
nt.assert_in("CONFLICT (content): Merge conflict in a.txt", so)
nt.assert_not_in("Intbr 'master' not tracked, jump pull.", so)
nt.assert_not_in("Creating new ftr branch starting from 'master'", so)
def test_ftrbr_start_nointbr():
oriR = utils.Repo(utils.DIR_REPO_BASE)
cloR = utils.Repo(utils.DIR_REPO_CLONE_FTRBR)
utils.clone_arepo(oriR.dir(), cloR.dir())
#already tests in another module
so,se,rc = cloR.exe_cmd_deny('git intbr')
#when not set, it fails ... no check ret code
so,se,rc = cloR.exe_cmd('git intbr-unset %s' % utils.CFG_FTR_PREFIX )
so,se,rc = cloR.exe_cmd_deny('git ftrbr-start aaa')
nt.eq_(so, '')
nt.eq_(se, 'Integration branch not set')
so,se,rc = cloR.exe_cmd_succ('git config --local %s ftr/' % utils.CFG_FTR_PREFIX )
so,se,rc = cloR.exe_cmd_deny('git ftrbr-start aaa')
nt.eq_(so, '')
nt.eq_(se, 'Integration branch not set')
def test_intbr_set_on_set_different():
oriR = utils.Repo(utils.DIR_REPO_BASE)
cloR = utils.Repo(utils.DIR_REPO_CLONE_INTBR)
utils.clone_arepo(oriR.dir(), cloR.dir())
#already tested first intbr set
so,se,rc = cloR.exe_cmd_succ('git intbr master')
#already tested first intbr set
so,se,rc = cloR.exe_cmd_succ('git checkout -b another')
so,se,rc = cloR.exe_cmd_succ('git intbr another')
nt.eq_(so, '')
so,se,rc = cloR.exe_cmd_succ('git intbr')
nt.eq_(so, 'another')
so,se,rc = cloR.exe_cmd_succ('git config --get 4f.intbr')
nt.eq_(so, 'another')
def test_intbr_istracked():
oriR = utils.Repo(utils.DIR_REPO_BASE)
cloR = utils.Repo(utils.DIR_REPO_CLONE_INTBR)
utils.clone_arepo(oriR.dir(), cloR.dir())
#just cloned, no intbr, unset scenario
so,se,rc = cloR.exe_cmd_deny('git intbr-istracked')
nt.eq_(so, '')
nt.eq_(se, 'Integration branch not set')
#tracked scenario
so,se,rc = cloR.exe_cmd_succ('git intbr master')
so,se,rc = cloR.exe_cmd_succ('git intbr-istracked')
nt.eq_(so, 'master <- origin/master')
nt.eq_(se, '')
so,se,rc = cloR.exe_cmd_succ('git intbr-unset')
so,se,rc = cloR.exe_cmd_deny('git intbr-istracked')
nt.eq_(so, '')
nt.eq_(se, 'Integration branch not set')
#untracked scenario
so,se,rc = cloR.exe_cmd_succ('git checkout -b another master')
so,se,rc = cloR.exe_cmd_succ('git intbr another')
so,se,rc = cloR.exe_cmd_deny('git intbr-istracked')
nt.eq_(so, '')
nt.eq_(se, "Integration branch 'another' not tracked")
#one param more ... ignored
so,se,rc = cloR.exe_cmd_succ('git intbr master')
so,se,rc = cloR.exe_cmd_succ('git intbr-istracked aaa')
nt.eq_(so, 'master <- origin/master')
nt.eq_(se, '')
