summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2018-05-15 10:51:34 +0200
committerJürg Billeter <j@bitron.ch>2018-07-09 15:44:49 +0200
commit3d1e23d638f7d2fbbb84e9d831a19529677559df (patch)
treef968d432c76391eb1e160cd43c3080a51795e0fc
parentc5fe94650fd40360400624888492ff81e993eab4 (diff)
downloadbuildstream-3d1e23d638f7d2fbbb84e9d831a19529677559df.tar.gz
tests: Remove unneeded ArtifactShare.update_summary() method
The OSTree summary file is no longer used.
-rw-r--r--tests/artifactcache/junctions.py6
-rw-r--r--tests/frontend/pull.py10
-rw-r--r--tests/frontend/push.py14
-rw-r--r--tests/testutils/artifactshare.py10
4 files changed, 0 insertions, 40 deletions
diff --git a/tests/artifactcache/junctions.py b/tests/artifactcache/junctions.py
index 12423f937..0457d46c3 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 c43cc83e3..9caf727ac 100644
--- a/tests/frontend/pull.py
+++ b/tests/frontend/pull.py
@@ -57,7 +57,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)
@@ -104,9 +103,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')
@@ -158,9 +154,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')
@@ -203,7 +196,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)
@@ -254,7 +246,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)
@@ -301,7 +292,6 @@ def test_push_pull_cross_junction(cli, tmpdir, datafiles):
cache_dir = os.path.join(project, 'cache', 'artifacts')
shutil.rmtree(cache_dir)
- share.update_summary()
assert cli.get_element_state(project, 'junction.bst:import-etc.bst') == 'buildable'
# Now try bst pull
diff --git a/tests/frontend/push.py b/tests/frontend/push.py
index ca46b0447..4752d9ef1 100644
--- a/tests/frontend/push.py
+++ b/tests/frontend/push.py
@@ -170,7 +170,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')
@@ -235,9 +234,6 @@ def test_artifact_expires(cli, datafiles, tmpdir):
result = cli.run(project=project, args=['build', 'element2.bst'])
result.assert_success()
- # update the share
- share.update_summary()
-
# check that element's 1 and 2 are cached both locally and remotely
assert cli.get_element_state(project, 'element1.bst') == 'cached'
assert_shared(cli, share, project, 'element1.bst')
@@ -254,9 +250,6 @@ def test_artifact_expires(cli, datafiles, tmpdir):
result = cli.run(project=project, args=['build', 'element3.bst'])
result.assert_success()
- # update the share
- share.update_summary()
-
# Ensure it is cached both locally and remotely
assert cli.get_element_state(project, 'element3.bst') == 'cached'
assert_shared(cli, share, project, 'element3.bst')
@@ -298,9 +291,6 @@ def test_artifact_too_large(cli, datafiles, tmpdir):
result = cli.run(project=project, args=['build', 'large_element.bst'])
result.assert_success()
- # update the cache
- share.update_summary()
-
# Ensure that the small artifact is still in the share
assert cli.get_element_state(project, 'small_element.bst') == 'cached'
assert_shared(cli, share, project, 'small_element.bst')
@@ -343,8 +333,6 @@ def test_recently_pulled_artifact_does_not_expire(cli, datafiles, tmpdir):
result = cli.run(project=project, args=['build', 'element2.bst'])
result.assert_success()
- share.update_summary()
-
# Ensure they are cached locally
assert cli.get_element_state(project, 'element1.bst') == 'cached'
assert cli.get_element_state(project, 'element2.bst') == 'cached'
@@ -370,8 +358,6 @@ def test_recently_pulled_artifact_does_not_expire(cli, datafiles, tmpdir):
result = cli.run(project=project, args=['build', 'element3.bst'])
result.assert_success()
- share.update_summary()
-
# Make sure it's cached locally and remotely
assert cli.get_element_state(project, 'element3.bst') == 'cached'
assert_shared(cli, share, project, 'element3.bst')
diff --git a/tests/testutils/artifactshare.py b/tests/testutils/artifactshare.py
index 8664c69d0..57ed5989c 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