From 68098bec3769998f2d04adf85f67d43d5b24a345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Tue, 27 Jun 2017 07:46:35 +0200 Subject: [PATCH] ostree: Update tests for no ostree init MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lubomír Sedlář --- tests/test_ostree_script.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/tests/test_ostree_script.py b/tests/test_ostree_script.py index d72a5b83..ea672588 100644 --- a/tests/test_ostree_script.py +++ b/tests/test_ostree_script.py @@ -44,9 +44,7 @@ class OstreeTreeScriptTest(helpers.PungiTestCase): self.maxDiff = None self.assertItemsEqual( run.call_args_list, - [mock.call(['ostree', 'init', '--repo=%s' % repo, '--mode=archive-z2'], - logfile=self.topdir + '/logs/Atomic/init-ostree-repo.log', show_cmd=True, stdout=True), - mock.call(['rpm-ostree', 'compose', 'tree', '--repo=%s' % repo, + [mock.call(['rpm-ostree', 'compose', 'tree', '--repo=%s' % repo, '--write-commitid-to=%s' % (self.topdir + '/logs/Atomic/commitid.log'), self.topdir + '/fedora-atomic-docker-host.json'], logfile=self.topdir + '/logs/Atomic/create-ostree-repo.log', show_cmd=True, stdout=True)]) @@ -67,9 +65,7 @@ class OstreeTreeScriptTest(helpers.PungiTestCase): self.maxDiff = None self.assertItemsEqual( run.call_args_list, - [mock.call(['ostree', 'init', '--repo=%s' % repo, '--mode=archive-z2'], - logfile=self.topdir + '/logs/Atomic/init-ostree-repo.log', show_cmd=True, stdout=True), - mock.call(['rpm-ostree', 'compose', 'tree', '--repo=%s' % repo, + [mock.call(['rpm-ostree', 'compose', 'tree', '--repo=%s' % repo, '--write-commitid-to=%s' % (self.topdir + '/logs/Atomic/commitid.log'), self.topdir + '/fedora-atomic-docker-host.json'], logfile=self.topdir + '/logs/Atomic/create-ostree-repo.log', show_cmd=True, stdout=True)]) @@ -110,9 +106,7 @@ class OstreeTreeScriptTest(helpers.PungiTestCase): self.maxDiff = None self.assertItemsEqual( run.call_args_list, - [mock.call(['ostree', 'init', '--repo=%s' % repo, '--mode=archive-z2'], - logfile=self.topdir + '/logs/Atomic/init-ostree-repo.log', show_cmd=True, stdout=True), - mock.call(['rpm-ostree', 'compose', 'tree', '--repo=%s' % repo, + [mock.call(['rpm-ostree', 'compose', 'tree', '--repo=%s' % repo, '--write-commitid-to=%s' % (self.topdir + '/logs/Atomic/commitid.log'), self.topdir + '/fedora-atomic-docker-host.json'], logfile=self.topdir + '/logs/Atomic/create-ostree-repo.log', show_cmd=True, stdout=True), @@ -134,9 +128,7 @@ class OstreeTreeScriptTest(helpers.PungiTestCase): self.maxDiff = None self.assertItemsEqual( run.call_args_list, - [mock.call(['ostree', 'init', '--repo=%s' % repo, '--mode=archive-z2'], - logfile=self.topdir + '/logs/Atomic/init-ostree-repo.log', show_cmd=True, stdout=True), - mock.call(['rpm-ostree', 'compose', 'tree', '--repo=%s' % repo, + [mock.call(['rpm-ostree', 'compose', 'tree', '--repo=%s' % repo, '--write-commitid-to=%s' % (self.topdir + '/logs/Atomic/commitid.log'), '--add-metadata-string=version=24', self.topdir + '/fedora-atomic-docker-host.json'],