status-im
/
open-bounty
mirror of https://github.com/status-im/open-bounty.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'Jenkins/experiment' of github.com:status-im/open-bounty into Jenkins/experiment

This commit is contained in:
Churikova Tetiana 2018-04-23 18:04:09 +03:00
parent fef8240f64 3469d6531d
commit 8435dc5425
No known key found for this signature in database
GPG Key ID: 0D4EA7B33B47E6D8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/end-to-end/pages/thirdparty/github.py vendored
View File

@ -297,7 +297,11 @@ class GithubPage(BasePageObject):
repo = git.Repo(self.local_repo_path)
logging.info(repo.git.status())
logging.info(repo.git.pull('upstream', 'master'))
logging.info(repo.git.push('origin', 'master'))
repo_url = 'https://%s:%s@github.com/%s/%s.git' % (test_data.config['DEV']['gh_username'],
test_data.config['DEV']['gh_password'], test_data.config['DEV']['gh_username'], test_data.config['ORG']['gh_repo_name'])
logging.info('Pushing to %s' % repo_url)
logging.info(repo.git.push(repo_url))
logging.info(repo.git.fetch('--all'))
repo.git.checkout('-b', branch)
file = open(os.path.join(self.local_repo_path, file_to_modify), 'w')

2
test/end-to-end/pytest.ini
View File

@ -1,3 +1,3 @@
[pytest]
norecursedirs = .git pages
addopts = -s -v --junitxml=results/result.xml --tb=short --env=local
addopts = -s -v --junitxml=results/result.xml --tb=short