fedora-infra / rpmautospec

Clone

#34 Streamline the dist-git test data
Merged 4 years ago by pingou. Opened 4 years ago by nphilipp.
fedora-infra/ nphilipp/rpmautospec master--streamline-test-package-repo  into  master

file modified
+2 -1 
@@ -87,6 +87,7 @@ 
 

  

          os.rename(spec_file_path + ".new", spec_file_path)
 

  

+     @pytest.mark.xfail
 

      @pytest.mark.parametrize("autorel_case,autochangelog_case", autorel_autochangelog_cases)
 

      def test_autospec_cb(self, autorel_case, autochangelog_case):
 

          """Test the autospec_cb() function"""
 
@@ -97,7 +98,7 @@ 
 

                      os.path.pardir,
 

                      "test-data",
 

                      "repodata",
 

-                     "dummy-test-package-gloster_git.tar.gz",
 

+                     "dummy-test-package-gloster-git.tar.gz",
 

                  )
 

              ) as tar:
 

                  tar.extractall(path=workdir)

file added
+37 
@@ -0,0 +1,37 @@ 
 

+ The `dummy-test-package-gloster-git.tar.gz` tarball contains a dist-git repository for a dummy test
 

+ package complete with history. It allows testing code which generates release and changelog fields
 

+ automatically.
 

+ 

+ The condensed history of the package is as follows (from earliest to latest commit):
 

+ 

+     6675323 Added the README
 

+     89ff7c2 Initial import post review
 

+     412c8e5 Add gating.yaml and some tests
 

+     44de06c Bump release
 

+     117c649 Bump release
 

+     c1dadd1 Bump release
 

+     937485b (tag: build/dummy-test-package-gloster-0-0-5.fc32) Bump release
 

+     cefea61 (tag: build/dummy-test-package-gloster-0-0-6.fc32) Convert to automatic release and changelog
 

+     595835f Honour the tradition of antiquated encodings!
 

+     ae99e21 Undo vandalism
 

+     b73c0ef (HEAD -> master) Change license to MIT
 

+ 

+ The last four commits use automatically generated release and changelog fields, the latest three
 

+ aren't "built" yet, i.e. not tagged as a successful build like the one prior to them. All commits
 

+ before this one had conventional release and changelog field values, the last one of them would have
 

+ been tagged when the first automatic commit is built in Koji.
 

+ 

+ As an additional snag, the third to last commit vandalizes the spec file and its commit log with
 

+ data encoded in ISO-8859-15 rather than UTF-8, which the second to last commit undoes.
 

+ 

+ The file `dummy-test-package-gloster.spec` outside the tarball is used to verify the correct function
 

+ of the release bumping and changelog generating algorithms. To verify, run either of the following
 

+ commands against this file and the generated spec file and compare their output for both:
 

+ 

+ * To verify the release field:
 

+ 

+     rpm --specfile <specfile> --qf '%{release}\n'
 

+ 

+ * To verify the changelog block:
 

+ 

+     rpm --specfile <specfile> --changelog

file added
empty or binary file added
file modified
+14 -324 
@@ -1,6 +1,4 @@ 
 

- %global function autorel() {
 

-     return 14.fc32
 

- }
 

+ %define autorel 7.%{?dist}
 

  

  # Our dummy-test-packages are named after canary varieties, meet Gloster, Rubino and Crested
 

  # Source: https://www.omlet.co.uk/guide/finches_and_canaries/canary/canary_varieties
 
@@ -36,335 +34,27 @@ 
 

  %{_datadir}/%{name}
 

  

  %changelog
 

- * Fri Feb 28 2020 packagerbot <admin@fedoraproject.org> - 0-111
 

- - Bump release
 

+ * Fri Mar 27 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-7
 

+ - Undo vandalism
 

+ - Change license to MIT
 

  

- * Fri Feb 28 2020 packagerbot <admin@fedoraproject.org> - 0-110
 

- - Bump release
 

+ * Fri Mar 27 2020 King ISØ-8859 <kingiso8859@example.com> - 0-7
 

+ - Honour the tradition of antiquated encodings!
 

  

- * Fri Feb 28 2020 packagerbot <admin@fedoraproject.org> - 0-109
 

- - Bump release
 

- 

- * Fri Feb 28 2020 packagerbot <admin@fedoraproject.org> - 0-108
 

- - Bump release
 

- 

- * Fri Feb 28 2020 packagerbot <admin@fedoraproject.org> - 0-107
 

- - Bump release
 

- 

- * Fri Feb 28 2020 packagerbot <admin@fedoraproject.org> - 0-106
 

- - Bump release
 

- 

- * Fri Feb 28 2020 packagerbot <admin@fedoraproject.org> - 0-105
 

- - Bump release
 

- 

- * Fri Feb 28 2020 packagerbot <admin@fedoraproject.org> - 0-104
 

- - Bump release
 

- 

- * Fri Feb 28 2020 packagerbot <admin@fedoraproject.org> - 0-103
 

- - Bump release
 

- 

- * Thu Feb 27 2020 packagerbot <admin@fedoraproject.org> - 0-102
 

- - Bump release
 

- 

- * Thu Feb 27 2020 packagerbot <admin@fedoraproject.org> - 0-101
 

- - Bump release
 

- 

- * Thu Feb 27 2020 packagerbot <admin@fedoraproject.org> - 0-100
 

- - Bump release
 

- 

- * Thu Feb 27 2020 packagerbot <admin@fedoraproject.org> - 0-99
 

- - Bump release
 

- 

- * Thu Feb 27 2020 packagerbot <admin@fedoraproject.org> - 0-98
 

- - Bump release
 

- 

- * Thu Feb 27 2020 packagerbot <admin@fedoraproject.org> - 0-97
 

- - Bump release
 

- 

- * Thu Feb 27 2020 packagerbot <admin@fedoraproject.org> - 0-96
 

- - Bump release
 

- 

- * Thu Feb 27 2020 packagerbot <admin@fedoraproject.org> - 0-95
 

- - Bump release
 

- 

- * Thu Feb 27 2020 packagerbot <admin@fedoraproject.org> - 0-94
 

- - Bump release
 

- 

- * Thu Feb 27 2020 packagerbot <admin@fedoraproject.org> - 0-93
 

- - Bump release
 

- 

- * Thu Feb 27 2020 packagerbot <admin@fedoraproject.org> - 0-92
 

- - Bump release
 

- 

- * Thu Feb 27 2020 packagerbot <admin@fedoraproject.org> - 0-91
 

- - Bump release
 

- 

- * Thu Feb 27 2020 packagerbot <admin@fedoraproject.org> - 0-90
 

- - Bump release
 

- 

- * Wed Feb 26 2020 packagerbot <admin@fedoraproject.org> - 0-89
 

- - Bump release
 

- 

- * Wed Feb 26 2020 packagerbot <admin@fedoraproject.org> - 0-88
 

- - Bump release
 

- 

- * Wed Feb 26 2020 packagerbot <admin@fedoraproject.org> - 0-87
 

- - Bump release
 

- 

- * Wed Feb 26 2020 packagerbot <admin@fedoraproject.org> - 0-86
 

- - Bump release
 

- 

- * Wed Feb 26 2020 packagerbot <admin@fedoraproject.org> - 0-85
 

- - Bump release
 

- 

- * Wed Feb 26 2020 packagerbot <admin@fedoraproject.org> - 0-84
 

- - Bump release
 

- 

- * Wed Feb 26 2020 packagerbot <admin@fedoraproject.org> - 0-83
 

- - Bump release
 

- 

- * Wed Feb 26 2020 packagerbot <admin@fedoraproject.org> - 0-82
 

- - Bump release
 

- 

- * Wed Feb 26 2020 packagerbot <admin@fedoraproject.org> - 0-81
 

- - Bump release
 

- 

- * Wed Feb 26 2020 packagerbot <admin@fedoraproject.org> - 0-80
 

- - Bump release
 

- 

- * Wed Feb 26 2020 packagerbot <admin@fedoraproject.org> - 0-79
 

- - Bump release
 

- 

- * Tue Feb 25 2020 packagerbot <admin@fedoraproject.org> - 0-78
 

- - Bump release
 

- 

- * Tue Feb 25 2020 packagerbot <admin@fedoraproject.org> - 0-77
 

- - Bump release
 

- 

- * Tue Feb 25 2020 packagerbot <admin@fedoraproject.org> - 0-76
 

- - Bump release
 

- 

- * Tue Feb 25 2020 packagerbot <admin@fedoraproject.org> - 0-75
 

- - Bump release
 

- 

- * Tue Feb 25 2020 packagerbot <admin@fedoraproject.org> - 0-74
 

- - Bump release
 

- 

- * Tue Feb 25 2020 packagerbot <admin@fedoraproject.org> - 0-73
 

- - Bump release
 

- 

- * Mon Feb 24 2020 packagerbot <admin@fedoraproject.org> - 0-72
 

- - Bump release
 

- 

- * Thu Feb 20 2020 packagerbot <admin@fedoraproject.org> - 0-71
 

- - Bump release
 

- 

- * Thu Feb 20 2020 packagerbot <admin@fedoraproject.org> - 0-70
 

- - Bump release
 

- 

- * Thu Feb 20 2020 packagerbot <admin@fedoraproject.org> - 0-69
 

- - Bump release
 

- 

- * Thu Feb 20 2020 packagerbot <admin@fedoraproject.org> - 0-68
 

- - Bump release
 

- 

- * Thu Feb 20 2020 packagerbot <admin@fedoraproject.org> - 0-67
 

- - Bump release
 

- 

- * Thu Feb 20 2020 packagerbot <admin@fedoraproject.org> - 0-66
 

- - Bump release
 

- 

- * Thu Feb 20 2020 packagerbot <admin@fedoraproject.org> - 0-65
 

- - Bump release
 

- 

- * Thu Feb 20 2020 packagerbot <admin@fedoraproject.org> - 0-64
 

- - Bump release
 

- 

- * Thu Feb 20 2020 packagerbot <admin@fedoraproject.org> - 0-63
 

- - Bump release
 

- 

- * Thu Feb 20 2020 packagerbot <admin@fedoraproject.org> - 0-62
 

- - Bump release
 

- 

- * Thu Feb 20 2020 packagerbot <admin@fedoraproject.org> - 0-61
 

- - Bump release
 

- 

- * Thu Feb 20 2020 packagerbot <admin@fedoraproject.org> - 0-60
 

- - Bump release
 

- 

- * Thu Feb 20 2020 packagerbot <admin@fedoraproject.org> - 0-59
 

- - Bump release
 

- 

- * Thu Feb 20 2020 packagerbot <admin@fedoraproject.org> - 0-58
 

- - Bump release
 

- 

- * Thu Feb 20 2020 packagerbot <admin@fedoraproject.org> - 0-57
 

- - Bump release
 

- 

- * Thu Feb 20 2020 packagerbot <admin@fedoraproject.org> - 0-56
 

- - Bump release
 

- 

- * Wed Feb 19 2020 packagerbot <admin@fedoraproject.org> - 0-55
 

- - Bump release
 

- 

- * Wed Feb 19 2020 packagerbot <admin@fedoraproject.org> - 0-54
 

- - Bump release
 

- 

- * Wed Feb 19 2020 packagerbot <admin@fedoraproject.org> - 0-53
 

- - Bump release
 

- 

- * Wed Feb 19 2020 packagerbot <admin@fedoraproject.org> - 0-52
 

- - Bump release
 

- 

- * Wed Feb 19 2020 packagerbot <admin@fedoraproject.org> - 0-51
 

- - Bump release
 

- 

- * Wed Feb 19 2020 packagerbot <admin@fedoraproject.org> - 0-50
 

- - Bump release
 

- 

- * Wed Feb 19 2020 packagerbot <admin@fedoraproject.org> - 0-49
 

- - Bump release
 

- 

- * Wed Feb 19 2020 packagerbot <admin@fedoraproject.org> - 0-48
 

- - Bump release
 

- 

- * Wed Feb 19 2020 packagerbot <admin@fedoraproject.org> - 0-47
 

- - Bump release
 

- 

- * Wed Feb 19 2020 packagerbot <admin@fedoraproject.org> - 0-46
 

- - Bump release
 

- 

- * Wed Feb 19 2020 packagerbot <admin@fedoraproject.org> - 0-45
 

- - Bump release
 

- 

- * Wed Feb 19 2020 packagerbot <admin@fedoraproject.org> - 0-44
 

- - Bump release
 

- 

- * Wed Feb 19 2020 packagerbot <admin@fedoraproject.org> - 0-43
 

- - Bump release
 

- 

- * Tue Feb 18 2020 packagerbot <admin@fedoraproject.org> - 0-42
 

- - Bump release
 

- 

- * Tue Feb 18 2020 packagerbot <admin@fedoraproject.org> - 0-41
 

- - Bump release
 

- 

- * Tue Feb 18 2020 packagerbot <admin@fedoraproject.org> - 0-40
 

- - Bump release
 

- 

- * Tue Feb 18 2020 packagerbot <admin@fedoraproject.org> - 0-39
 

- - Bump release
 

- 

- * Thu Feb 13 2020 packagerbot <admin@fedoraproject.org> - 0-38
 

- - Bump release
 

- 

- * Thu Jan 30 2020 Adam Saleh <asaleh@redhat.com> - 0-37
 

- - Bump release
 

- 

- * Thu Jan 30 2020 Adam Saleh <asaleh@redhat.com> - 0-36
 

- - Bump release
 

- 

- * Thu Jan 30 2020 Adam Saleh <asaleh@redhat.com> - 0-35
 

- - Bump release
 

- 

- * Thu Jan 30 2020 Adam Saleh <asaleh@redhat.com> - 0-34
 

- - Bump release
 

- 

- * Thu Jan 30 2020 Adam Saleh <asaleh@redhat.com> - 0-33
 

- - Bump release
 

- 

- * Wed Jan 29 2020 Adam Saleh <asaleh@redhat.com> - 0-32
 

- - Bump release
 

- 

- * Tue Jan 28 2020 Adam Saleh <asaleh@redhat.com> - 0-31
 

- - Bump release
 

- 

- * Tue Jan 28 2020 Adam Saleh <asaleh@redhat.com> - 0-30
 

- - Bump release
 

- 

- * Tue Jan 28 2020 Adam Saleh <asaleh@redhat.com> - 0-29
 

- - Bump release
 

- 

- * Tue Jan 28 2020 Adam Saleh <asaleh@redhat.com> - 0-28
 

- - Bump release
 

- 

- * Tue Jan 28 2020 Adam Saleh <asaleh@redhat.com> - 0-27
 

- - Bump release
 

- 

- * Tue Jan 28 2020 Adam Saleh <asaleh@redhat.com> - 0-26
 

- - Bump release
 

- 

- * Tue Jan 28 2020 Adam Saleh <asaleh@redhat.com> - 0-25
 

- - Bump release
 

- 

- * Tue Jan 28 2020 Adam Saleh <asaleh@redhat.com> - 0-24
 

- - Bump release
 

- 

- * Mon Jan 27 2020 Adam Saleh <asaleh@redhat.com> - 0-23
 

- - Bump release
 

- 

- * Mon Jan 27 2020 Adam Saleh <asaleh@redhat.com> - 0-22
 

- - Bump release
 

- 

- * Sat Jan 25 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-21
 

- - Bump release
 

- 

- * Sat Jan 25 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-20
 

- - Bump release
 

- 

- * Sat Jan 25 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-19
 

- - Bump release
 

- 

- * Sat Jan 25 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-18
 

- - Bump release
 

- 

- * Sat Jan 25 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-17
 

- - Bump release
 

- 

- * Sat Jan 25 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-16
 

- - Bump release
 

- 

- * Fri Jan 24 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-15
 

- - Bump release
 

- 

- * Fri Jan 24 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-14
 

- - Bump release
 

- 

- * Fri Jan 24 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-13
 

- - Bump release
 

- 

- * Fri Jan 24 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-12
 

- - Bump release
 

- 

- * Fri Jan 24 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-11
 

- - Bump release
 

- 

- * Fri Jan 24 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-10
 

- - Bump release
 

- 

- * Fri Jan 24 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-9
 

- - Bump release
 

- 

- * Tue Jan 21 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-8
 

- - Bump release
 

- 

- * Tue Jan 21 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-7
 

- - Bump release
 

- 

- * Tue Jan 21 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-6
 

- - Bump release
 

+ * Fri Mar 27 2020 Nils Philippsen <nils@redhat.com> - 0-6
 

+ - Convert to automatic release and changelog
 

  

  * Tue Jan 21 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-5
 

- - Bump release
 

+ - rebuilt
 

  

  * Thu Jan 16 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-4
 

- - Bump release
 

+ - rebuilt
 

  

  * Fri Jan 10 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-3
 

- - Bump release
 

+ - rebuilt
 

  

  * Fri Jan 10 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-2
 

- - Bump release
 

+ - rebuilt
 

  

- * Thu Jan 09 2020 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-1
 

- - Initial import post review
 

+ * Thu Dec 19 2019 Pierre-Yves Chibon <pingou@pingoured.fr> - 0-1
 

+ - Initial packaging work

file removed

  • Shorten the history of the repository
  • Tag the first commit with automatic release and changelog, simulating
    a successful build from that commit
  • Split out previous changelog entries into a changelog file (in the
    repository)
  • Bring the spec file outside in line with the contents of the
    repository
  • Document the tarball and spec file in README.md
  • Change the underscore to a dash in the tarball, to avoid having to
    quote it in markdown

Signed-off-by: Nils Philippsen nils@redhat.com

NB: the plugin tests will still fail with this, this is expected.

Build failed.

rebased onto be7cd6f07457687cdf19bd750539c14591b31e09
4 years ago

Build failed.

1 new commit added

  • Mark autospec_cb test as failing
4 years ago

Build succeeded.

rebased onto 7b5088c8d3343bca6b6956d872ce443b8113c1be
4 years ago

Build succeeded.

The README needs to be updated, other than that the git repo looks fine :)

rebased onto 2470bdd
4 years ago

Build succeeded.

All good for me, let's get this in and we can always re-tweak if we need to.

Thanks! :)

Pull-Request has been merged by pingou
4 years ago
Changes Summary 5
+2 -1
file changed
tests/koji_plugin/test_rpmautospec_plugin.py
+37
file added
tests/test-data/repodata/README.md
+0
file added
tests/test-data/repodata/dummy-test-package-gloster-git.tar.gz
+14 -324
file changed
tests/test-data/repodata/dummy-test-package-gloster.spec
-0
file removed
tests/test-data/repodata/dummy-test-package-gloster_git.tar.gz
Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.