Merge "executor: prevent false positive diskaccountant warning"

1 files changed, 3 insertions, 0 deletions

diff --git a/zuul/executor/server.py b/zuul/executor/server.py
index 9178a6726..1d0850881 100644
--- a/zuul/executor/server.py
+++ b/zuul/executor/server.py
@@ -120,6 +120,9 @@ class DiskAccountant(object):
         :param callable usage_func: Optional function to call with usage
                                     for every dir _NOT_ over limit
         '''
+        # Remove any trailing slash to ensure dirname equality tests work
+        cache_dir = cache_dir.rstrip('/')
+        jobs_base = jobs_base.rstrip('/')
         # Don't cross the streams
         if cache_dir == jobs_base:
             raise Exception("Cache dir and jobs dir cannot be the same")