#461 Fix failing tests on EPEL6 (see #439)
Merged a year ago by msuchy. Opened a year ago by frostyx.
copr/ frostyx/copr 439-fix-epel6-tests  into  master

file modified
+4 -2

@@ -35,25 +35,27 @@ 

  

  Recommends:    python3-progress

  

- BuildRequires: python3-copr

+ BuildRequires: python3-copr >= 1.89

  BuildRequires: python3-devel

  BuildRequires: python3-jinja2

  BuildRequires: python3-pylint

  BuildRequires: python3-pytest

  BuildRequires: python3-setuptools

  BuildRequires: python3-simplejson

+ BuildRequires: python3-munch

  %else

  Requires:      python-copr >= 1.89

  Requires:      python-jinja2

  Requires:      python-simplejson

  

  BuildRequires: pytest

- BuildRequires: python-copr

+ BuildRequires: python-copr >= 1.89

  BuildRequires: python-devel

  BuildRequires: python-jinja2

  BuildRequires: python-mock

  BuildRequires: python-setuptools

  BuildRequires: python-simplejson

+ BuildRequires: python-munch

  %endif

  

  # We historically shipped empty doc package, uninstall it.

file modified
+10 -10

@@ -303,8 +303,8 @@ 

              print("Build was added to {0}:".format(builds[0].projectname))

  

              for build in builds:

-                 url = urljoin(self.config["copr_url"], "/coprs/build/{}".format(build.id))

-                 print("  {}".format(url))

+                 url = urljoin(self.config["copr_url"], "/coprs/build/{0}".format(build.id))

+                 print("  {0}".format(url))

  

              build_ids = [build.id for build in builds]

              print("Created builds: {0}".format(" ".join(map(str, build_ids))))

@@ -370,7 +370,7 @@ 

          """

          username, copr = self.parse_name(args.copr)

          project = self.client.project_proxy.delete(ownername=username, projectname=copr)

-         print("Project {} has been deleted.".format(project.name))

+         print("Project {0} has been deleted.".format(project.name))

  

      @requires_api_auth

      def action_fork(self, args):

@@ -391,10 +391,10 @@ 

                                                   dstownername=dstownername, dstprojectname=dstprojectname,

                                                   confirm=args.confirm)

          if not dst:

-             print("Forking project {}/{} for you into {}.\nPlease be aware that it may take a few minutes "

+             print("Forking project {0}/{1} for you into {2}.\nPlease be aware that it may take a few minutes "

                    "to duplicate backend data.".format(srcownername, srcprojectname, project.full_name))

          else:

-             print("Updating packages in {} from {}/{}.\nPlease be aware that it may take a few minutes "

+             print("Updating packages in {0} from {1}/{2}.\nPlease be aware that it may take a few minutes "

                    "to duplicate backend data.".format(project.full_name, srcownername, srcprojectname))

  

      def action_mock_config(self, args):

@@ -426,14 +426,14 @@ 

                  return

  

              for project in projects:

-                 print("Name: {}".format(project.name))

-                 print("  Description: {}".format(project.description))

+                 print("Name: {0}".format(project.name))

+                 print("  Description: {0}".format(project.description))

                  if project.chroot_repos:

                      print("  Repo(s):")

                      for name, url in project.chroot_repos.items():

-                         print("    {}: {}".format(name, url))

+                         print("    {0}: {1}".format(name, url))

                  if project.additional_repos:

-                     print("  Additional repo: {}".format(" ".join(project.additional_repos)))

+                     print("  Additional repo: {0}".format(" ".join(project.additional_repos)))

                  print("")

  

          except CoprRequestException as ex:

@@ -652,7 +652,7 @@ 

                  module = self.client.module_proxy.build_from_file(ownername, projectname, args.yaml)

              else:

                  module = self.client.module_proxy.build_from_url(ownername, projectname, args.url)

-             print("Created module {}".format(module.nsv))

+             print("Created module {0}".format(module.nsv))

  

          except CoprRequestException as ex:

              print(ex)

There is a couple of fixes for copr-cli so the tests are passing and it can be built in EPEL6.
One thing though, I needed to manually install

https://koji.fedoraproject.org/koji/buildinfo?buildID=1138728

because

https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2018-70e6cc2e39

is still not pushed to stable. Can we do that @clime?

Pagure strikes again. The showed diff is not complete, you can't see the 40f3f55 in it.

Pull-Request has been merged by msuchy

a year ago