diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2013-03-05 17:49:56 +0200 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-06-05 14:20:07 +0300 |
| commit | 90d94d86a75c5ae093cc47b0836de2ebf4da88cd (patch) | |
| tree | 65c21a68a31809ad8ee14de1f5dd4c7eb3952360 /tests/component/rpm | |
| parent | b86dc269f3ef0cfbf720a66db0bade64b71c036d (diff) | |
| download | git-buildpackage-90d94d86a75c5ae093cc47b0836de2ebf4da88cd.tar.gz git-buildpackage-90d94d86a75c5ae093cc47b0836de2ebf4da88cd.tar.bz2 git-buildpackage-90d94d86a75c5ae093cc47b0836de2ebf4da88cd.zip | |
CentOS compatibility: fix tests
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'tests/component/rpm')
| -rw-r--r-- | tests/component/rpm/test_import_srpm.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/component/rpm/test_import_srpm.py b/tests/component/rpm/test_import_srpm.py index c9a1a429..f6ee0ed0 100644 --- a/tests/component/rpm/test_import_srpm.py +++ b/tests/component/rpm/test_import_srpm.py @@ -48,8 +48,8 @@ class TestImportPacked(ComponentTestBase): assert import_srpm(['arg0', srpm]) == 0 # Check repository state repo = GitRepository('gbp-test') - files = {'Makefile', 'README', 'bar.tar.gz', 'dummy.sh', 'foo.txt', - 'gbp-test.spec', 'my.patch', 'mydir/', 'mydir/myfile.txt'} + files = set(['Makefile', 'README', 'bar.tar.gz', 'dummy.sh', 'foo.txt', + 'gbp-test.spec', 'my.patch', 'mydir/', 'mydir/myfile.txt']) self._check_repo_state(repo, 'master', ['master', 'upstream'], files) # Four commits: upstream, packaging files, one patch and the removal # of imported patches @@ -61,9 +61,9 @@ class TestImportPacked(ComponentTestBase): assert import_srpm(['arg0', srpm]) == 0 # Check repository state repo = GitRepository('gbp-test2') - files = {'Makefile', 'README', 'bar.tar.gz', 'dummy.sh', 'foo.txt', + files = set(['Makefile', 'README', 'bar.tar.gz', 'dummy.sh', 'foo.txt', 'gbp-test2.spec', 'gbp-test2-alt.spec', 'my.patch', 'mydir/', - 'mydir/myfile.txt'} + 'mydir/myfile.txt']) self._check_repo_state(repo, 'master', ['master', 'upstream'], files) # Four commits: upstream, packaging files, one patch and the removal @@ -79,8 +79,8 @@ class TestImportPacked(ComponentTestBase): assert import_srpm(['arg0', '--orphan-packaging', srpm]) == 0 # Check repository state repo = GitRepository('gbp-test2') - files = {'bar.tar.gz', 'foo.txt', 'gbp-test2.spec', - 'gbp-test2-alt.spec', 'my.patch', 'my2.patch', 'my3.patch'} + files = set(['bar.tar.gz', 'foo.txt', 'gbp-test2.spec', + 'gbp-test2-alt.spec', 'my.patch', 'my2.patch', 'my3.patch']) self._check_repo_state(repo, 'master', ['master', 'upstream'], files) # Only one commit: the packaging files assert len(repo.get_commits()) == 1 @@ -90,8 +90,8 @@ class TestImportPacked(ComponentTestBase): srpm = os.path.join(DATA_DIR, 'gbp-test-native-1.0-1.src.rpm') assert import_srpm(['arg0', '--native', srpm]) == 0 # Check repository state - files = {'.gbp.conf', 'Makefile', 'README', 'dummy.sh', 'packaging/', - 'packaging/gbp-test-native.spec'} + files = set(['.gbp.conf', 'Makefile', 'README', 'dummy.sh', + 'packaging/', '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 @@ -126,8 +126,8 @@ class TestImportPacked(ComponentTestBase): assert len(repo.get_commits(until='upstream')) == 1 # Import new version assert import_srpm(['arg0', srpms[2]]) == 0 - files = {'Makefile', 'README', 'bar.tar.gz', 'dummy.sh', 'foo.txt', - 'gbp-test.spec', 'my.patch', 'mydir/', 'mydir/myfile.txt'} + files = set(['Makefile', 'README', 'bar.tar.gz', 'dummy.sh', 'foo.txt', + 'gbp-test.spec', 'my.patch', 'mydir/', 'mydir/myfile.txt']) self._check_repo_state(repo, 'master', ['master', 'upstream'], files) assert len(repo.get_commits()) == 11 assert len(repo.get_commits(until='upstream')) == 2 @@ -195,11 +195,11 @@ class TestImportPacked(ComponentTestBase): srpm]) == 0 # Check repository state repo = GitRepository('gbp-test2') - files = {'Makefile', 'README', 'dummy.sh', 'packaging/', + files = set(['Makefile', 'README', 'dummy.sh', 'packaging/', '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/my3.patch']) self._check_repo_state(repo, 'pack', ['pack', 'orig'], files) assert len(repo.get_commits()) == 2 # Check packaging dir |