From cd4c5addd10e00af3c480b941fb52057573b7c67 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Tue, 10 May 2016 15:03:01 +0800 Subject: [PATCH] 1. Reset to 0.27 2. Keep same code with latest release Change-Id: I30588773b0a039c9f5002bf65b5c768a16fb7935 --- .gitmodules | 6 +-- README | 6 ++- TODO | 3 -- debian/changelog | 8 --- debian/source/options | 2 +- gbp/scripts/common/import_orig.py | 10 ---- packaging/git-buildpackage.changes | 4 -- packaging/git-buildpackage.spec | 2 +- tests/component/rpm/test_import_srpm.py | 21 ++++---- tests/{20_test_rpm.py => test_rpm.py} | 4 +- .../rpmbuild/SOURCES/bar.tar.gz | Bin .../rpmbuild/SOURCES/foo.txt | 0 .../rpmbuild/SOURCES/gbp-test-1.0.tar.bz2 | Bin .../rpmbuild/SOURCES/gbp-test-native-1.0.zip | Bin .../rpmbuild/SOURCES/gbp-test2-3.0.tar.gz | Bin .../rpmbuild/SOURCES/my.patch | 0 .../rpmbuild/SOURCES/my2.patch | 0 .../rpmbuild/SOURCES/my3.patch | 0 .../rpmbuild/SPECS/gbp-test-native.spec | 0 .../rpmbuild/SPECS/gbp-test-native2.spec | 0 .../rpmbuild/SPECS/gbp-test.spec | 0 .../rpmbuild/SPECS/gbp-test2.spec | 0 .../rpmbuild/SPECS/gbp-test2.spec.orig | 46 ++++++++++++++++++ .../specs/gbp-test-native.spec | 0 .../specs/gbp-test-native2.spec | 0 .../specs/gbp-test-quirks.spec | 0 .../specs/gbp-test-reference.spec | 0 .../specs/gbp-test-reference2.spec | 0 .../specs/gbp-test-tags.spec | 0 .../specs/gbp-test-updates-reference.spec | 0 .../specs/gbp-test-updates.spec | 0 .../rpm => test_rpm_data}/specs/gbp-test.spec | 0 .../specs/gbp-test2-reference.spec | 0 .../specs/gbp-test2-reference2.spec | 0 .../specs/gbp-test2.spec | 0 .../srpms/gbp-test-1.0-1.src.rpm | Bin .../srpms/gbp-test-native-1.0-1.src.rpm | Bin .../srpms/gbp-test-native2-2.0-0.src.rpm | Bin .../srpms/gbp-test2-3.0-0.src.rpm | Bin 39 files changed, 68 insertions(+), 44 deletions(-) rename tests/{20_test_rpm.py => test_rpm.py} (99%) rename tests/{data/rpm => test_rpm_data}/rpmbuild/SOURCES/bar.tar.gz (100%) rename tests/{data/rpm => test_rpm_data}/rpmbuild/SOURCES/foo.txt (100%) rename tests/{data/rpm => test_rpm_data}/rpmbuild/SOURCES/gbp-test-1.0.tar.bz2 (100%) rename tests/{data/rpm => test_rpm_data}/rpmbuild/SOURCES/gbp-test-native-1.0.zip (100%) rename tests/{data/rpm => test_rpm_data}/rpmbuild/SOURCES/gbp-test2-3.0.tar.gz (100%) rename tests/{data/rpm => test_rpm_data}/rpmbuild/SOURCES/my.patch (100%) rename tests/{data/rpm => test_rpm_data}/rpmbuild/SOURCES/my2.patch (100%) rename tests/{data/rpm => test_rpm_data}/rpmbuild/SOURCES/my3.patch (100%) rename tests/{data/rpm => test_rpm_data}/rpmbuild/SPECS/gbp-test-native.spec (100%) rename tests/{data/rpm => test_rpm_data}/rpmbuild/SPECS/gbp-test-native2.spec (100%) rename tests/{data/rpm => test_rpm_data}/rpmbuild/SPECS/gbp-test.spec (100%) rename tests/{data/rpm => test_rpm_data}/rpmbuild/SPECS/gbp-test2.spec (100%) create mode 100644 tests/test_rpm_data/rpmbuild/SPECS/gbp-test2.spec.orig rename tests/{data/rpm => test_rpm_data}/specs/gbp-test-native.spec (100%) rename tests/{data/rpm => test_rpm_data}/specs/gbp-test-native2.spec (100%) rename tests/{data/rpm => test_rpm_data}/specs/gbp-test-quirks.spec (100%) rename tests/{data/rpm => test_rpm_data}/specs/gbp-test-reference.spec (100%) rename tests/{data/rpm => test_rpm_data}/specs/gbp-test-reference2.spec (100%) rename tests/{data/rpm => test_rpm_data}/specs/gbp-test-tags.spec (100%) rename tests/{data/rpm => test_rpm_data}/specs/gbp-test-updates-reference.spec (100%) rename tests/{data/rpm => test_rpm_data}/specs/gbp-test-updates.spec (100%) rename tests/{data/rpm => test_rpm_data}/specs/gbp-test.spec (100%) rename tests/{data/rpm => test_rpm_data}/specs/gbp-test2-reference.spec (100%) rename tests/{data/rpm => test_rpm_data}/specs/gbp-test2-reference2.spec (100%) rename tests/{data/rpm => test_rpm_data}/specs/gbp-test2.spec (100%) rename tests/{data/rpm => test_rpm_data}/srpms/gbp-test-1.0-1.src.rpm (100%) rename tests/{data/rpm => test_rpm_data}/srpms/gbp-test-native-1.0-1.src.rpm (100%) rename tests/{data/rpm => test_rpm_data}/srpms/gbp-test-native2-2.0-0.src.rpm (100%) rename tests/{data/rpm => test_rpm_data}/srpms/gbp-test2-3.0-0.src.rpm (100%) diff --git a/.gitmodules b/.gitmodules index 7f8a520a..02d21b87 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "tests/component/rpm/data"] - path = tests/component/rpm/data - url = ssh://jenkins@109.123.100.123:29418/tizen.org-tools/git-buildpackage-rpm-testdata [submodule "tests/component/deb/data"] path = tests/component/deb/data url = ssh://jenkins@109.123.100.123:29418/tizen.org-tools/git-buildpackage-deb-testdata +[submodule "tests/component/rpm/data"] + path = tests/component/rpm/data + url = ssh://jenkins@109.123.100.123:29418/tizen.org-tools/git-buildpackage-rpm-testdata diff --git a/README b/README index 4acc68bc..26a155aa 100644 --- a/README +++ b/README @@ -14,6 +14,10 @@ The API documentation of the gbp module can be found at: http://honk.sigxcpu.org/projects/git-buildpackage/apidocs/ -The documentation available for the RPM support can be found at +The limited documentation available for the RPM support can be found at http://marquiz.github.com/git-buildpackage-rpm/ + +Unfortunately, the manpages for RPM tools are still missing. Refer to +--help option of the commands, for the most detailed description of different +options. diff --git a/TODO b/TODO index cf9c6809..295398a5 100644 --- a/TODO +++ b/TODO @@ -1,8 +1,5 @@ See https://honk.sigxcpu.org/piki/projects/git-buildpackage/ - - - RPM-related things: - unit tests: - add unit tests for the rpm command line tools diff --git a/debian/changelog b/debian/changelog index a6adc71f..ee6ad668 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,3 @@ -git-buildpackage (0.6.28-tizen20160308) unstable; urgency=medium - - * Check codes in devel branch - - -- Jun Wang TUE, 08 Mar 2016 10:20:21 +0800 - - - git-buildpackage (0.6.27-tizen20160302) unstable; urgency=medium * Fix error logs when __import__ faild,like "No handlers could be found fo logger" diff --git a/debian/source/options b/debian/source/options index 6862544b..f2592903 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1,2 +1,2 @@ -extend-diff-ignore = "^(tests/data/rpm/.*|tests/component/rpm/data/.*|tests/component/deb/data/.*)" +extend-diff-ignore = "^(tests/test_rpm_data/.*|tests/component/rpm/data/.*|tests/component/deb/data/.*)" diff-ignore diff --git a/gbp/scripts/common/import_orig.py b/gbp/scripts/common/import_orig.py index 45e71c57..16244423 100644 --- a/gbp/scripts/common/import_orig.py +++ b/gbp/scripts/common/import_orig.py @@ -148,16 +148,6 @@ def prepare_sources(source, pkg_name, pkg_version, pristine_commit_name, pristine_path = pristine.path if pristine else '' return (filtered.unpacked, pristine_path) -def repack_source(source, new_name, unpack_dir, filters, new_prefix=None): - """Repack the source tree""" - repacked = source.pack(new_name, filters, new_prefix) - if source.is_tarball(): # the tarball was filtered on unpack - repacked.unpacked = source.unpacked - else: # otherwise unpack the generated tarball get a filtered tree - repacked.unpack(unpack_dir) - return repacked - - def prepare_pristine_tar(source, pkg_name, pkg_version, pristine_commit_name, filters=None, prefix=None, tmpdir=None): """ diff --git a/packaging/git-buildpackage.changes b/packaging/git-buildpackage.changes index ef2c9eba..5f8ecf55 100644 --- a/packaging/git-buildpackage.changes +++ b/packaging/git-buildpackage.changes @@ -1,7 +1,3 @@ -* Wed Mar 08 2016 Jun Wang tizen/0.6.28-20160308 -- Make new tag in devel -- Upgrade version to 0.6.28 - * Wed Mar 02 2016 Jun Wang tizen/0.6.27-20160302 - Upgrade version to 0.6.27 diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec index 5532b3b3..d71f172d 100644 --- a/packaging/git-buildpackage.spec +++ b/packaging/git-buildpackage.spec @@ -3,7 +3,7 @@ Name: git-buildpackage Summary: Build packages from git -Version: 0.6.28 +Version: 0.6.27 Release: 0 Group: Development/Tools/Building License: GPLv2 diff --git a/tests/component/rpm/test_import_srpm.py b/tests/component/rpm/test_import_srpm.py index b35a5bd6..6635400b 100644 --- a/tests/component/rpm/test_import_srpm.py +++ b/tests/component/rpm/test_import_srpm.py @@ -72,8 +72,8 @@ class TestImportPacked(ComponentTestBase): # Check repository state repo = GitRepository('gbp-test2') files = set(['Makefile', 'README', 'bar.tar.gz', 'dummy.sh', 'foo.txt', - 'gbp-test2.spec', 'gbp-test2-alt.spec', 'my.patch', - 'mydir/myfile.txt']) + 'gbp-test2.spec', 'gbp-test2-alt.spec', 'my.patch', + 'mydir/myfile.txt']) self._check_repo_state(repo, 'master', ['master', 'upstream'], files) # Four commits: upstream, packaging files, one patch and the removal @@ -101,7 +101,7 @@ class TestImportPacked(ComponentTestBase): eq_(mock_import(['--native', srpm]), 0) # Check repository state files = set(['.gbp.conf', 'Makefile', 'README', 'dummy.sh', - 'packaging/gbp-test-native.spec']) + 'packaging/gbp-test-native.spec']) repo = GitRepository('gbp-test-native') self._check_repo_state(repo, 'master', ['master'], files) # Only one commit: the imported source tarball @@ -120,7 +120,7 @@ class TestImportPacked(ComponentTestBase): def test_import_compressed_patches(self): """Test importing of non-native src.rpm with compressed patches""" srpm = os.path.join(DATA_DIR, 'gbp-test-1.1-2.src.rpm') - eq_(import_srpm(['arg0', srpm]), 0) + eq_(mock_import([srpm]), 0) # Check repository state repo = GitRepository('gbp-test') files = set(['Makefile', 'README', 'AUTHORS', 'NEWS', 'bar.tar.gz', @@ -144,13 +144,12 @@ class TestImportPacked(ComponentTestBase): eq_(mock_import([srpms[1]]), 0) eq_(len(repo.get_commits()), 4) eq_(len(repo.get_commits(until='upstream')), 1) - eq_(mock_import(['--no-pristine-tar', '--allow-same-version', - srpms[1]]), 0) + eq_(mock_import(['--allow-same-version', srpms[1]]), 0) # Added new versio packaging plus one patch eq_(len(repo.get_commits()), 7) eq_(len(repo.get_commits(until='upstream')), 1) # Import new version - eq_(mock_import(['--no-pristine-tar', srpms[2]]), 0) + eq_(mock_import([srpms[2]]), 0) files = set(['Makefile', 'README', 'bar.tar.gz', 'dummy.sh', 'foo.txt', 'gbp-test.spec', 'my.patch', 'mydir/myfile.txt']) self._check_repo_state(repo, 'master', ['master', 'upstream'], files) @@ -207,7 +206,7 @@ class TestImportPacked(ComponentTestBase): """Test various options of git-import-srpm""" srpm = os.path.join(DATA_DIR, 'gbp-test2-2.0-0.src.rpm') - eq_(mock_import(['--no-pristine-tar', + eq_(mock_import([ '--no-patch-import', '--packaging-branch=pack', '--upstream-branch=orig', @@ -219,9 +218,9 @@ class TestImportPacked(ComponentTestBase): # Check repository state repo = GitRepository('gbp-test2') files = set(['Makefile', 'README', 'dummy.sh', 'packaging/bar.tar.gz', - 'packaging/foo.txt', 'packaging/gbp-test2.spec', - 'packaging/gbp-test2-alt.spec', 'packaging/my.patch', - 'packaging/my2.patch', 'packaging/my3.patch']) + 'packaging/foo.txt', 'packaging/gbp-test2.spec', + 'packaging/gbp-test2-alt.spec', 'packaging/my.patch', + 'packaging/my2.patch', 'packaging/my3.patch']) self._check_repo_state(repo, 'pack', ['pack', 'orig'], files) eq_(len(repo.get_commits()), 2) # Check packaging dir diff --git a/tests/20_test_rpm.py b/tests/test_rpm.py similarity index 99% rename from tests/20_test_rpm.py rename to tests/test_rpm.py index 52a14ff1..97390465 100644 --- a/tests/20_test_rpm.py +++ b/tests/test_rpm.py @@ -27,7 +27,7 @@ from gbp.rpm import (SrcRpmFile, SpecFile, parse_srpm, NoSpecError, guess_spec, guess_spec_repo, spec_from_repo) from gbp.git.repository import GitRepository -DATA_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'data','rpm') +DATA_DIR = os.path.abspath(os.path.splitext(__file__)[0] + '_data') SRPM_DIR = os.path.join(DATA_DIR, 'srpms') SPEC_DIR = os.path.join(DATA_DIR, 'specs') @@ -390,7 +390,7 @@ class TestUtilityFunctions(object): def test_parse_srpm(self): """Test parse_srpm() function""" parse_srpm(os.path.join(SRPM_DIR, 'gbp-test-1.0-1.src.rpm')) - assert_raises(GbpError, parse_srpm, + assert_raises(GbpError, parse_srpm, os.path.join(DATA_DIR, 'notexists.src.rpm')) """ diff --git a/tests/data/rpm/rpmbuild/SOURCES/bar.tar.gz b/tests/test_rpm_data/rpmbuild/SOURCES/bar.tar.gz similarity index 100% rename from tests/data/rpm/rpmbuild/SOURCES/bar.tar.gz rename to tests/test_rpm_data/rpmbuild/SOURCES/bar.tar.gz diff --git a/tests/data/rpm/rpmbuild/SOURCES/foo.txt b/tests/test_rpm_data/rpmbuild/SOURCES/foo.txt similarity index 100% rename from tests/data/rpm/rpmbuild/SOURCES/foo.txt rename to tests/test_rpm_data/rpmbuild/SOURCES/foo.txt diff --git a/tests/data/rpm/rpmbuild/SOURCES/gbp-test-1.0.tar.bz2 b/tests/test_rpm_data/rpmbuild/SOURCES/gbp-test-1.0.tar.bz2 similarity index 100% rename from tests/data/rpm/rpmbuild/SOURCES/gbp-test-1.0.tar.bz2 rename to tests/test_rpm_data/rpmbuild/SOURCES/gbp-test-1.0.tar.bz2 diff --git a/tests/data/rpm/rpmbuild/SOURCES/gbp-test-native-1.0.zip b/tests/test_rpm_data/rpmbuild/SOURCES/gbp-test-native-1.0.zip similarity index 100% rename from tests/data/rpm/rpmbuild/SOURCES/gbp-test-native-1.0.zip rename to tests/test_rpm_data/rpmbuild/SOURCES/gbp-test-native-1.0.zip diff --git a/tests/data/rpm/rpmbuild/SOURCES/gbp-test2-3.0.tar.gz b/tests/test_rpm_data/rpmbuild/SOURCES/gbp-test2-3.0.tar.gz similarity index 100% rename from tests/data/rpm/rpmbuild/SOURCES/gbp-test2-3.0.tar.gz rename to tests/test_rpm_data/rpmbuild/SOURCES/gbp-test2-3.0.tar.gz diff --git a/tests/data/rpm/rpmbuild/SOURCES/my.patch b/tests/test_rpm_data/rpmbuild/SOURCES/my.patch similarity index 100% rename from tests/data/rpm/rpmbuild/SOURCES/my.patch rename to tests/test_rpm_data/rpmbuild/SOURCES/my.patch diff --git a/tests/data/rpm/rpmbuild/SOURCES/my2.patch b/tests/test_rpm_data/rpmbuild/SOURCES/my2.patch similarity index 100% rename from tests/data/rpm/rpmbuild/SOURCES/my2.patch rename to tests/test_rpm_data/rpmbuild/SOURCES/my2.patch diff --git a/tests/data/rpm/rpmbuild/SOURCES/my3.patch b/tests/test_rpm_data/rpmbuild/SOURCES/my3.patch similarity index 100% rename from tests/data/rpm/rpmbuild/SOURCES/my3.patch rename to tests/test_rpm_data/rpmbuild/SOURCES/my3.patch diff --git a/tests/data/rpm/rpmbuild/SPECS/gbp-test-native.spec b/tests/test_rpm_data/rpmbuild/SPECS/gbp-test-native.spec similarity index 100% rename from tests/data/rpm/rpmbuild/SPECS/gbp-test-native.spec rename to tests/test_rpm_data/rpmbuild/SPECS/gbp-test-native.spec diff --git a/tests/data/rpm/rpmbuild/SPECS/gbp-test-native2.spec b/tests/test_rpm_data/rpmbuild/SPECS/gbp-test-native2.spec similarity index 100% rename from tests/data/rpm/rpmbuild/SPECS/gbp-test-native2.spec rename to tests/test_rpm_data/rpmbuild/SPECS/gbp-test-native2.spec diff --git a/tests/data/rpm/rpmbuild/SPECS/gbp-test.spec b/tests/test_rpm_data/rpmbuild/SPECS/gbp-test.spec similarity index 100% rename from tests/data/rpm/rpmbuild/SPECS/gbp-test.spec rename to tests/test_rpm_data/rpmbuild/SPECS/gbp-test.spec diff --git a/tests/data/rpm/rpmbuild/SPECS/gbp-test2.spec b/tests/test_rpm_data/rpmbuild/SPECS/gbp-test2.spec similarity index 100% rename from tests/data/rpm/rpmbuild/SPECS/gbp-test2.spec rename to tests/test_rpm_data/rpmbuild/SPECS/gbp-test2.spec diff --git a/tests/test_rpm_data/rpmbuild/SPECS/gbp-test2.spec.orig b/tests/test_rpm_data/rpmbuild/SPECS/gbp-test2.spec.orig new file mode 100644 index 00000000..ffae7e99 --- /dev/null +++ b/tests/test_rpm_data/rpmbuild/SPECS/gbp-test2.spec.orig @@ -0,0 +1,46 @@ +Name: gbp-test2 +Summary: Test package 2 for git-buildpackage +Epoch: 2 +Version: 3.0 +Release: 0 +Group: Development/Libraries +License: GPLv2 +Source10: ftp://ftp.host.com/%{name}-%{version}.tar.gz +Source: foo.txt +Source20: bar.tar.gz +# Gbp-Ignore-Patches: 0 +Patch: my.patch +Patch10: my2.patch +Patch20: my3.patch +Packager: Markus Lehtonen + +%description +Package for testing the RPM functionality of git-buildpackage. + + +%prep +%setup -T -n %{name}-%{version} -c -a 10 + +%patch +%patch -P 10 -p1 + +echo "Do things" + +# Gbp-Patch-Macros + +%build +make + + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}/%{_datadir}/%{name} +cp -R * %{buildroot}/%{_datadir}/%{name} +install %{SOURCE0} %{buildroot}/%{_datadir}/%{name} + + + +%files +%defattr(-,root,root,-) +%dir %{_datadir}/%{name} +%{_datadir}/%{name} diff --git a/tests/data/rpm/specs/gbp-test-native.spec b/tests/test_rpm_data/specs/gbp-test-native.spec similarity index 100% rename from tests/data/rpm/specs/gbp-test-native.spec rename to tests/test_rpm_data/specs/gbp-test-native.spec diff --git a/tests/data/rpm/specs/gbp-test-native2.spec b/tests/test_rpm_data/specs/gbp-test-native2.spec similarity index 100% rename from tests/data/rpm/specs/gbp-test-native2.spec rename to tests/test_rpm_data/specs/gbp-test-native2.spec diff --git a/tests/data/rpm/specs/gbp-test-quirks.spec b/tests/test_rpm_data/specs/gbp-test-quirks.spec similarity index 100% rename from tests/data/rpm/specs/gbp-test-quirks.spec rename to tests/test_rpm_data/specs/gbp-test-quirks.spec diff --git a/tests/data/rpm/specs/gbp-test-reference.spec b/tests/test_rpm_data/specs/gbp-test-reference.spec similarity index 100% rename from tests/data/rpm/specs/gbp-test-reference.spec rename to tests/test_rpm_data/specs/gbp-test-reference.spec diff --git a/tests/data/rpm/specs/gbp-test-reference2.spec b/tests/test_rpm_data/specs/gbp-test-reference2.spec similarity index 100% rename from tests/data/rpm/specs/gbp-test-reference2.spec rename to tests/test_rpm_data/specs/gbp-test-reference2.spec diff --git a/tests/data/rpm/specs/gbp-test-tags.spec b/tests/test_rpm_data/specs/gbp-test-tags.spec similarity index 100% rename from tests/data/rpm/specs/gbp-test-tags.spec rename to tests/test_rpm_data/specs/gbp-test-tags.spec diff --git a/tests/data/rpm/specs/gbp-test-updates-reference.spec b/tests/test_rpm_data/specs/gbp-test-updates-reference.spec similarity index 100% rename from tests/data/rpm/specs/gbp-test-updates-reference.spec rename to tests/test_rpm_data/specs/gbp-test-updates-reference.spec diff --git a/tests/data/rpm/specs/gbp-test-updates.spec b/tests/test_rpm_data/specs/gbp-test-updates.spec similarity index 100% rename from tests/data/rpm/specs/gbp-test-updates.spec rename to tests/test_rpm_data/specs/gbp-test-updates.spec diff --git a/tests/data/rpm/specs/gbp-test.spec b/tests/test_rpm_data/specs/gbp-test.spec similarity index 100% rename from tests/data/rpm/specs/gbp-test.spec rename to tests/test_rpm_data/specs/gbp-test.spec diff --git a/tests/data/rpm/specs/gbp-test2-reference.spec b/tests/test_rpm_data/specs/gbp-test2-reference.spec similarity index 100% rename from tests/data/rpm/specs/gbp-test2-reference.spec rename to tests/test_rpm_data/specs/gbp-test2-reference.spec diff --git a/tests/data/rpm/specs/gbp-test2-reference2.spec b/tests/test_rpm_data/specs/gbp-test2-reference2.spec similarity index 100% rename from tests/data/rpm/specs/gbp-test2-reference2.spec rename to tests/test_rpm_data/specs/gbp-test2-reference2.spec diff --git a/tests/data/rpm/specs/gbp-test2.spec b/tests/test_rpm_data/specs/gbp-test2.spec similarity index 100% rename from tests/data/rpm/specs/gbp-test2.spec rename to tests/test_rpm_data/specs/gbp-test2.spec diff --git a/tests/data/rpm/srpms/gbp-test-1.0-1.src.rpm b/tests/test_rpm_data/srpms/gbp-test-1.0-1.src.rpm similarity index 100% rename from tests/data/rpm/srpms/gbp-test-1.0-1.src.rpm rename to tests/test_rpm_data/srpms/gbp-test-1.0-1.src.rpm diff --git a/tests/data/rpm/srpms/gbp-test-native-1.0-1.src.rpm b/tests/test_rpm_data/srpms/gbp-test-native-1.0-1.src.rpm similarity index 100% rename from tests/data/rpm/srpms/gbp-test-native-1.0-1.src.rpm rename to tests/test_rpm_data/srpms/gbp-test-native-1.0-1.src.rpm diff --git a/tests/data/rpm/srpms/gbp-test-native2-2.0-0.src.rpm b/tests/test_rpm_data/srpms/gbp-test-native2-2.0-0.src.rpm similarity index 100% rename from tests/data/rpm/srpms/gbp-test-native2-2.0-0.src.rpm rename to tests/test_rpm_data/srpms/gbp-test-native2-2.0-0.src.rpm diff --git a/tests/data/rpm/srpms/gbp-test2-3.0-0.src.rpm b/tests/test_rpm_data/srpms/gbp-test2-3.0-0.src.rpm similarity index 100% rename from tests/data/rpm/srpms/gbp-test2-3.0-0.src.rpm rename to tests/test_rpm_data/srpms/gbp-test2-3.0-0.src.rpm -- 2.34.1