This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch jmac/googlecas_and_virtual_directories_1 in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit bd8f7709f8dab5b16ddb30082cc593fec04cf398 Author: Jürg Billeter <[email protected]> AuthorDate: Tue May 15 10:51:34 2018 +0200 tests: Remove unneeded ArtifactShare.upate_summary() method The OSTree summary file is no longer used. --- tests/artifactcache/junctions.py | 6 ------ tests/frontend/pull.py | 9 --------- tests/frontend/push.py | 1 - tests/testutils/artifactshare.py | 10 ---------- 4 files changed, 26 deletions(-) diff --git a/tests/artifactcache/junctions.py b/tests/artifactcache/junctions.py index 12423f9..0457d46 100644 --- a/tests/artifactcache/junctions.py +++ b/tests/artifactcache/junctions.py @@ -67,12 +67,6 @@ def test_push_pull(cli, tmpdir, datafiles): assert_shared(cli, share, 'foo', project, 'target.bst') assert_shared(cli, base_share, 'base', base_project, 'target.bst') - # Make sure we update the summary in our artifact shares, - # we dont have a real server around to do it - # - share.update_summary() - base_share.update_summary() - # Now we've pushed, delete the user's local artifact cache # directory and try to redownload it from the share # diff --git a/tests/frontend/pull.py b/tests/frontend/pull.py index c3ebe41..68a4ca2 100644 --- a/tests/frontend/pull.py +++ b/tests/frontend/pull.py @@ -55,7 +55,6 @@ def test_push_pull_all(cli, tmpdir, datafiles): assert cli.get_element_state(project, 'target.bst') == 'cached' # Assert that everything is now cached in the remote. - share.update_summary() all_elements = ['target.bst', 'import-bin.bst', 'import-dev.bst', 'compose-all.bst'] for element_name in all_elements: assert_shared(cli, share, project, element_name) @@ -102,9 +101,6 @@ def test_pull_secondary_cache(cli, tmpdir, datafiles): result = cli.run(project=project, args=['build', 'target.bst']) result.assert_success() - share1.update_summary() - share2.update_summary() - assert_not_shared(cli, share1, project, 'target.bst') assert_shared(cli, share2, project, 'target.bst') @@ -156,9 +152,6 @@ def test_push_pull_specific_remote(cli, tmpdir, datafiles): ]) result.assert_success() - good_share.update_summary() - bad_share.update_summary() - # Assert that all the artifacts are in the share we pushed # to, and not the other. assert_shared(cli, good_share, project, 'target.bst') @@ -201,7 +194,6 @@ def test_push_pull_non_strict(cli, tmpdir, datafiles): assert cli.get_element_state(project, 'target.bst') == 'cached' # Assert that everything is now cached in the remote. - share.update_summary() all_elements = ['target.bst', 'import-bin.bst', 'import-dev.bst', 'compose-all.bst'] for element_name in all_elements: assert_shared(cli, share, project, element_name) @@ -252,7 +244,6 @@ def test_push_pull_track_non_strict(cli, tmpdir, datafiles): assert cli.get_element_state(project, 'target.bst') == 'cached' # Assert that everything is now cached in the remote. - share.update_summary() all_elements = {'target.bst', 'import-bin.bst', 'import-dev.bst', 'compose-all.bst'} for element_name in all_elements: assert_shared(cli, share, project, element_name) diff --git a/tests/frontend/push.py b/tests/frontend/push.py index e9c2daa..3415152 100644 --- a/tests/frontend/push.py +++ b/tests/frontend/push.py @@ -165,7 +165,6 @@ def test_push_after_pull(cli, tmpdir, datafiles): result = cli.run(project=project, args=['build', 'target.bst']) result.assert_success() - share1.update_summary() cli.remove_artifact_from_cache(project, 'target.bst') assert_shared(cli, share1, project, 'target.bst') diff --git a/tests/testutils/artifactshare.py b/tests/testutils/artifactshare.py index 8664c69..57ed598 100644 --- a/tests/testutils/artifactshare.py +++ b/tests/testutils/artifactshare.py @@ -40,7 +40,6 @@ class ArtifactShare(): os.makedirs(self.repo) self.init() - self.update_summary() # init(): # @@ -55,15 +54,6 @@ class ArtifactShare(): '--repo', self.repo, '--mode', 'archive-z2']) - # update_summary(): - # - # Ensure that the summary is up to date - # - def update_summary(self): - subprocess.call(['ostree', 'summary', - '--update', - '--repo', self.repo]) - # has_artifact(): # # Checks whether the artifact is present in the share
