Merge ~hloeung/ubuntu-repository-cache:fixes into ubuntu-repository-cache:master

[Haw Loeung]

Ignore systemd/system/snapd.mounts.target.wants/snap-* in bzrignore to reduce cron spam

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 3bd749b65f9657e00a8ae090a575c6dc74030994

diff --git a/lib/ubuntu_repository_cache/metadata_cleanup.py b/lib/ubuntu_repository_cache/metadata_cleanup.py
index 6d74cf5..2e2d350 100644
--- a/lib/ubuntu_repository_cache/metadata_cleanup.py
+++ b/lib/ubuntu_repository_cache/metadata_cleanup.py
@@ -20,7 +20,6 @@ def main(environment, log):
 
 
 if __name__ == "__main__":
-
     # Use the logging infrastructure to print messages with timestamps to
     # stdout. This is a cheap way to get good timestamps. Ideally we should
     # move to leverage the logging infrastructure better. ~tribaal
diff --git a/lib/ubuntu_repository_cache/metadata_peers_sync.py b/lib/ubuntu_repository_cache/metadata_peers_sync.py
index 7ab5bd1..e129bfc 100644
--- a/lib/ubuntu_repository_cache/metadata_peers_sync.py
+++ b/lib/ubuntu_repository_cache/metadata_peers_sync.py
@@ -82,7 +82,6 @@ def ubuntu_repository_cache_sync(environment, log):
 
 
 if __name__ == "__main__":
-
     # Use the logging infrastructure to print messages with timestamps to
     # stdout. This is a cheap way to get good timestamps. Ideally we should
     # move to leverage the logging infrastructure better. ~tribaal
diff --git a/lib/ubuntu_repository_cache/metadata_sync.py b/lib/ubuntu_repository_cache/metadata_sync.py
index cbc01b3..d428f3d 100644
--- a/lib/ubuntu_repository_cache/metadata_sync.py
+++ b/lib/ubuntu_repository_cache/metadata_sync.py
@@ -621,7 +621,6 @@ def _verify_distribution(path, release):
 
 
 if __name__ == "__main__":
-
     # Use the logging infrastructure to print messages with timestamps to
     # stdout. This is a cheap way to get good timestamps. Ideally we should
     # move to leverage the logging infrastructure better. ~tribaal
diff --git a/lib/ubuntu_repository_cache/tests/test_apache.py b/lib/ubuntu_repository_cache/tests/test_apache.py
index aef2b7a..8de4501 100644
--- a/lib/ubuntu_repository_cache/tests/test_apache.py
+++ b/lib/ubuntu_repository_cache/tests/test_apache.py
@@ -24,7 +24,6 @@ class ApacheTestCase(unittest.TestCase):
 
     @mock.patch('multiprocessing.cpu_count')
     def test_tune_mpm_configs(self, cpu_count):
-
         cpu_count.return_value = 4
         config = {
             'startservers': 0,
diff --git a/reactive/ubuntu_repository_cache.py b/reactive/ubuntu_repository_cache.py
index c6f7246..101c686 100755
--- a/reactive/ubuntu_repository_cache.py
+++ b/reactive/ubuntu_repository_cache.py
@@ -421,6 +421,7 @@ systemd/system/default.target.wants/snap-*.mount
 systemd/system/default.target.wants/snap-*.service
 systemd/system/snap-*.mount
 systemd/system/snap.*.service
+systemd/system/snapd.mounts.target.wants/snap-*.mount
 # end section ignore due to LP#1598304
 '''
         _write_file('\n'.join(new) + ignore_snaps, bzrignore_path, perms=0o600)
@@ -483,7 +484,6 @@ def _write_file(source, dest_path, perms=0o644, owner=None, group=None):
 
 
 def _update_aliases(admin_email='', aliases_path='/etc/aliases'):
-
     aliases = []
     try:
         with open(aliases_path, 'r') as f:
diff --git a/tests/unit/test_ubuntu_repository_cache.py b/tests/unit/test_ubuntu_repository_cache.py
index e73e27c..1dd66fb 100644
--- a/tests/unit/test_ubuntu_repository_cache.py
+++ b/tests/unit/test_ubuntu_repository_cache.py
@@ -133,6 +133,7 @@ systemd/system/default.target.wants/snap-*.mount
 systemd/system/default.target.wants/snap-*.service
 systemd/system/snap-*.mount
 systemd/system/snap.*.service
+systemd/system/snapd.mounts.target.wants/snap-*.mount
 # end section ignore due to LP#1598304
 '''
         with open(bzrignore_path, 'r', encoding='utf-8') as f: