dist-git: allow importing pre-generated srpm in rpkg

Related: fedora-copr#2317

pyrpkg don't allow using pre-generated SRPM by default.
They created for this `allow_pre_generated_srpm` for us.

dist-git/copr_dist_git/package_import.py

@@ -158,7 +158,8 @@ def _load_commands(opts, repo_name, repo_dir):
                         anongiturl="",
                         branchre="",
                         kojiprofile="",
-                        build_client="")
+                        build_client="",
+                        allow_pre_generated_srpm=True)
 
     # rpkg gets module_name as a basename of git url
     # we use module_name as "username/projectname/package_name"

dist-git/tests/test_crazy_merging.py

@@ -6,7 +6,6 @@
 import shutil
 import time
 import os
-import logging
 
 from munch import Munch
 from subprocess import check_output
@@ -230,7 +229,6 @@ def test_diverge_middle_branches(self, initial_commit_everywhere, mc_setup_git_r
         assert v3_hash_a != v1_hash
         assert v3_hash_b != v1_hash
 
-    @pytest.mark.skip(reason="Remove the skip once python-rpkg resolves issue #677")
     def test_no_op_1(self, initial_commit_everywhere, mc_setup_git_repo):
         branches, opts, v1_hash = initial_commit_everywhere
         origin, all_branches, middle_branches, border_branches = branches