buildstream/_artifactcache/cascache.py

@@ -228,7 +228,7 @@ class CASCache(ArtifactCache):
             try:
                 remote.init()
 
-                element.info("Pulling {} <- {}".format(element._get_brief_display_key(), remote.spec.url))
+                element.status("Pulling {} <- {}".format(element._get_brief_display_key(), remote.spec.url))
 
                 request = buildstream_pb2.GetReferenceRequest()
                 request.key = ref
@@ -250,11 +250,8 @@ class CASCache(ArtifactCache):
                     raise ArtifactError("Failed to pull artifact {}: {}".format(
                         element._get_brief_display_key(), e)) from e
                 else:
-                    self.context.message(Message(
-                        None,
-                        MessageType.INFO,
-                        "Remote ({}) does not have {} cached".format(
-                            remote.spec.url, element._get_brief_display_key())
+                    element.info("Remote ({}) does not have {} cached".format(
+                        remote.spec.url, element._get_brief_display_key()
                     ))
 
         return False
@@ -279,7 +276,7 @@ class CASCache(ArtifactCache):
         for remote in push_remotes:
             remote.init()
             skipped_remote = True
-            element.info("Pushing {} -> {}".format(element._get_brief_display_key(), remote.spec.url))
+            element.status("Pushing {} -> {}".format(element._get_brief_display_key(), remote.spec.url))
 
             try:
                 for ref in refs:
@@ -361,11 +358,8 @@ class CASCache(ArtifactCache):
                     raise ArtifactError("Failed to push artifact {}: {}".format(refs, e), temporary=True) from e
 
             if skipped_remote:
-                self.context.message(Message(
-                    None,
-                    MessageType.INFO,
-                    "Remote ({}) already has {} cached".format(
-                        remote.spec.url, element._get_brief_display_key())
+                element.info("Remote ({}) already has {} cached".format(
+                    remote.spec.url, element._get_brief_display_key()
                 ))
         return pushed
 

buildstream/element.py

@@ -1746,7 +1746,7 @@ class Element(Plugin):
 
         # Notify successfull download
         display_key = self._get_brief_display_key()
-        self.info("Downloaded artifact {}".format(display_key))
+        self.info("Pulled artifact {}".format(display_key))
         return True
 
     # _skip_push():
@@ -1785,16 +1785,15 @@ class Element(Plugin):
             self.warn("Not pushing tainted artifact.")
             return False
 
-        display_key = self._get_brief_display_key()
-        with self.timed_activity("Pushing artifact {}".format(display_key)):
-            # Push all keys used for local commit
-            pushed = self.__artifacts.push(self, self.__get_cache_keys_for_commit())
-            if not pushed:
-                return False
+        # Push all keys used for local commit
+        pushed = self.__artifacts.push(self, self.__get_cache_keys_for_commit())
+        if not pushed:
+            return False
 
-            # Notify successful upload
-            self.info("Pushed artifact {}".format(display_key))
-            return True
+        # Notify successful upload
+        display_key = self._get_brief_display_key()
+        self.info("Pushed artifact {}".format(display_key))
+        return True
 
     # _shell():
     #

tests/frontend/push.py

@@ -386,3 +386,26 @@ def test_push_cross_junction(cli, tmpdir, datafiles):
 
         cache_key = cli.get_element_key(project, 'junction.bst:import-etc.bst')
         assert share.has_artifact('subtest', 'import-etc.bst', cache_key)
+
+
+@pytest.mark.datafiles(DATA_DIR)
+def test_push_already_cached(caplog, cli, tmpdir, datafiles):
+    project = os.path.join(datafiles.dirname, datafiles.basename)
+    caplog.set_level(1)
+
+    with create_artifact_share(os.path.join(str(tmpdir), 'artifactshare')) as share:
+
+        cli.configure({
+            'artifacts': {'url': share.repo, 'push': True}
+        })
+        result = cli.run(project=project, args=['build', 'target.bst'])
+
+        result.assert_success()
+        assert "SKIPPED Push" not in result.stderr
+
+        result = cli.run(project=project, args=['push', 'target.bst'])
+
+        result.assert_success()
+        assert not result.get_pushed_elements(), "No elements should have been pushed since the cache was populated"
+        assert "INFO    Remote ({}) already has ".format(share.repo) in result.stderr
+        assert "SKIPPED Push" in result.stderr

tests/testutils/runcli.py

@@ -178,7 +178,7 @@ class Result():
         return list(pushed)
 
     def get_pulled_elements(self):
-        pulled = re.findall(r'\[\s*pull:(\S+)\s*\]\s*INFO\s*Downloaded artifact', self.stderr)
+        pulled = re.findall(r'\[\s*pull:(\S+)\s*\]\s*INFO\s*Pulled artifact', self.stderr)
         if pulled is None:
             return []