koji

Clone

#4228 cli: wait-repo: wait for a current repo by default
Merged 6 months ago by mikem. Opened 6 months ago by mikem.
mikem/koji wait-repo-current  into  master

file modified
+7 -1 
@@ -7360,8 +7360,14 @@ 
 

              error('' if suboptions.quiet else msg)
 

          return
 

  

+     if builds:
 

+         # we're waiting for a repo with these builds, not necessarily a current one
 

+         min_event = None
 

+     else:
 

+         # wait for a current repo
 

+         min_event = "last"
 

      watcher = _get_watcher(options, suboptions, session, tag['id'], nvrs=suboptions.builds,
 

-                            min_event=None)
 

+                            min_event=min_event)
 

  

      try:
 

          repoinfo = watcher.waitrepo(anon=anon)

file modified
+2 -2 
@@ -203,7 +203,7 @@ 
 

  

          expected = "%(name)s is not a build tag for any target" % self.TAG + "\n"
 

          self.assert_console_message(stderr, expected)
 

-         self.RepoWatcher.assert_called_with(self.session, self.TAG['id'], nvrs=[], min_event=None, logger=self.wait_logger)
 

+         self.RepoWatcher.assert_called_with(self.session, self.TAG['id'], nvrs=[], min_event="last", logger=self.wait_logger)
 

  

          # Cas 2. dest is matched, show suggestion
 

          self.RepoWatcher.reset_mock()
 
@@ -219,7 +219,7 @@ 
 

          expected = "%(name)s is not a build tag for any target" % self.TAG + "\n"
 

          expected += "Suggested tags: build-tag-1, build-tag-2, build-tag-3\n"
 

          self.assert_console_message(stderr, expected)
 

-         self.RepoWatcher.assert_called_with(self.session, self.TAG['id'], nvrs=[], min_event=None, logger=self.wait_logger)
 

+         self.RepoWatcher.assert_called_with(self.session, self.TAG['id'], nvrs=[], min_event="last", logger=self.wait_logger)
 

  

      def test_anon_handle_wait_repo_help(self):
 

          """Test anon_handle_wait_repo help message"""

The pre-1.35 behavior was to wait for a fresh regen.

Fixes: https://pagure.io/koji/issue/4226
Fixes: https://pagure.io/koji/issue/4229
Related: https://pagure.io/koji/issue/4227

Metadata Update from @tkopecek:
- Pull-request tagged with: testing-ready
6 months ago

Metadata Update from @mfilip:
- Pull-request tagged with: testing-done
6 months ago

Commit 9b08aad fixes this pull-request

Pull-Request has been merged by mikem
6 months ago
Metadata
None

testing-ready testing-done

Changes Summary 2
+7 -1
file changed
cli/koji_cli/commands.py
+2 -2
file changed
tests/test_cli/test_wait_repo.py
Powered by Pagure 5.14.1
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.