address review comments

Author: pietroalbini

homu/main.py

@@ -850,9 +850,10 @@ def init_local_git_cmds(repo_cfg, git_cfg):
     if not os.path.exists(fpath):
         utils.logged_call(['git', 'init', fpath])
 
-    remotes = {'origin': genurl(repo_cfg), 'test-origin': genurl(repo_cfg)}
-    if 'test-on-fork' in repo_cfg:
-        remotes['test-origin'] = genurl(repo_cfg['test-on-fork'])
+    remotes = {
+        'origin': genurl(repo_cfg),
+        'test-origin': genurl(repo_cfg.get('test-on-fork', repo_cfg)),
+    }
 
     for remote, url in remotes.items():
         try:

homu/server.py

@@ -661,9 +661,10 @@ def report_build_res(succ, url, builder, state, logger, repo_cfg):
                 def set_ref():
                     utils.github_set_ref(state.get_repo(), 'heads/' +
                                          state.base_ref, state.merge_sha)
-                    utils.github_set_ref(state.get_test_on_fork_repo(),
-                                         'heads/' + state.base_ref,
-                                         state.merge_sha, force=True)
+                    if state.test_on_fork is not None:
+                        utils.github_set_ref(state.get_test_on_fork_repo(),
+                                             'heads/' + state.base_ref,
+                                             state.merge_sha, force=True)
                 try:
                     try:
                         set_ref()