From bc452bb68901bdad08d352027c3eb12578a7dba3 Mon Sep 17 00:00:00 2001
From: Casper da Costa-Luis <casper.dcl@physics.org>
Date: Tue, 27 Aug 2019 20:30:43 +0100
Subject: [PATCH] minor test fix

---
 dvc/progress.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dvc/progress.py b/dvc/progress.py
index a2331fc93..93334c46b 100644
--- a/dvc/progress.py
+++ b/dvc/progress.py
@@ -83,9 +83,10 @@ class Tqdm(tqdm):
             **kwargs
         )
         if bar_format is None:
-            self.bar_format = (
-                self.BAR_FMT_DEFAULT if len(self) else self.BAR_FMT_NOTOTAL
-            )
+            if self.__len__():
+                self.bar_format = self.BAR_FMT_DEFAULT
+            else:
+                self.bar_format = self.BAR_FMT_NOTOTAL
         else:
             self.bar_format = bar_format
         self.refresh()
@@ -111,7 +112,7 @@ class Tqdm(tqdm):
     def format_dict(self):
         """inject `ncols_desc` to fill the display width (`ncols`)"""
         d = super(Tqdm, self).format_dict
-        ncols = d.get("ncols", 80)
+        ncols = d["ncols"] or 80
         ncols_desc = ncols - len(self.format_meter(ncols_desc=1, **d)) + 1
         d["ncols_desc"] = max(ncols_desc, 0)
         return d