#2123 Fixes related to the Red Hat Copr testing
Merged 2 years ago by praiskup. Opened 2 years ago by praiskup.
Unknown source tests-rh  into  main

@@ -60,7 +60,11 @@

          OUTPUT=`mktemp`

          rlRun "copr-cli create ${NAME_PREFIX}Project1 --chroot wrong-chroot-name 2> $OUTPUT" 1

          rlRun "cat $OUTPUT |grep -E '^Error: $'"

-         rlRun "cat $OUTPUT |grep \"\- name: Group copr (fas: gitcopr) already have project named\""

+         case $OWNER in

+         @copr) msg_exp="Group copr (fas: gitcopr) already has a project named" ;;

+         *) msg_exp="You already have a project named" ;;

+         esac

+         rlRun "cat $OUTPUT |grep \"\- name: $msg_exp\""

          rlRun "cat $OUTPUT |grep \"\- chroots: 'wrong-chroot-name' is not a valid choice for this field\""

  

          rlRun "yes | copr-cli new-webhook-secret ${NAME_PREFIX}Project1 | grep -E 'Generated new token: .*-.*-.*-.*-.*'"

@@ -266,9 +266,9 @@

      def __init__(self, message=None, user=None, group=None):

          if not message:

              if group is None:

-                 message = "You already have project named '{}'."

+                 message = "You already have a project named '{}'."

              else:

-                 message = "Group {} ".format(group) + "already have project named '{}'."

+                 message = "Group {} ".format(group) + "already has a project named '{}'."

          self.message = message

          if not user:

              user = flask.g.user

@@ -175,7 +175,7 @@

          assert len(self.models.Copr.query

                     .order_by(desc(models.Copr.created_on))

                     .filter(self.models.Copr.name == self.c1.name).all()) == foocoprs

-         assert b"You already have project named" in r.data

+         assert b"You already have a project named" in r.data

  

      @TransactionDecorator("u1")

      def test_copr_new_with_initial_pkgs(self, f_users, f_mock_chroots, f_db):

no initial comment

Build succeeded.

rebased onto 01889c6

2 years ago

Build succeeded.

Heh, I also dropped frontend/dump.rdb and also git-ignored it in PR#2117.
If we want it in .gitignore, just drop the commit, and we will use mine. If we want to just remove the file, leave it, and I will update my PR.

+1

2 new commits added

  • beaker: fix expected error for the Red Hat Copr testsuite
  • frontend: grammar fixes in error messages
2 years ago

Marking it release-blocker, complicates our testing...

Metadata Update from @praiskup:
- Pull-request tagged with: release-blocker

2 years ago

Build succeeded.

Pull-Request has been merged by praiskup

2 years ago