Merge branch 'features/requests' into devel

Author: guyzmo

git_repo/services/ext/github.py

@@ -152,7 +152,7 @@ def gist_delete(self, gist_id):
     def request_list(self, user, repo):
         repository = self.gh.repository(user, repo)
         for pull in repository.iter_pulls():
-            yield ( pull.number, pull.title, pull.links['issue'] )
+            yield ( str(pull.number), pull.title, pull.links['issue'] )
 
     def request_fetch(self, user, repo, request, pull=False):
         if pull:
@@ -162,7 +162,7 @@ def request_fetch(self, user, repo, request, pull=False):
             for remote in self.repository.remotes:
                 log.info('request_fetch, remote_name {}'.format(remote.name))
                 if remote.name == self.name:
-                    local_branch_name = 'request-{}'.format(request)
+                    local_branch_name = 'request/{}'.format(request)
                     self.fetch(
                         remote,
                         'pull/{}/head'.format(request),

tests/helpers.py

@@ -544,7 +544,7 @@ def action_request_fetch(self, cassette_name, namespace, repository, request, pu
             self.service.connect()
             self.service.clone(namespace, repository, rw=False)
             self.service.request_fetch(repository, namespace, request)
-            assert self.repository.branches[-1].name == 'request-{}'.format(request)
+            assert self.repository.branches[-1].name == 'request/{}'.format(request)
 
     def action_gist_list(self, cassette_name, gist=None, gist_list_data=[]):
         with self.recorder.use_cassette('_'.join(['test', self.service.name, cassette_name])):

tests/integration/test_main.py

@@ -309,8 +309,6 @@ def test_request_fetch__bad_request(self, capsys, caplog):
         out, err = capsys.readouterr()
         assert ('guyzmo', 'git-repo', 'bad') == seen_args
         assert {} == extra_args
-        print('out:', out)
-        print('err:', caplog.text)
         assert out == ''
         assert 'Fatal error: bad request for merge!' in caplog.text