implemented freezegun and added tests for fix wolph#160

wolph · wolph · commit b0a4f32ca088 · 2018-04-04T04:47:10.000+02:00
diff --git a/progressbar/widgets.py b/progressbar/widgets.py
@@ -273,11 +273,11 @@ def __call__(self, progress, data, delta=False):
             sample_values.append(progress.value)
 
             if isinstance(self.samples, datetime.timedelta):
-                begin_time = progress.last_update_time - self.samples
-                begin_value = sample_values[0]
-                while (sample_times[2:]
-                       and begin_time > sample_times[0]
-                       and begin_value > sample_values[0]):
+                minimum_time = progress.last_update_time - self.samples
+                minimum_value = sample_values[-1]
+                while (sample_times[2:] and
+                       minimum_time > sample_times[1] and
+                       minimum_value > sample_values[1]):
                     sample_times.pop(0)
                     sample_values.pop(0)
             else:
diff --git a/setup.py b/setup.py
@@ -75,7 +75,6 @@
                 'pytest-cov>=2.5.1',
                 'pytest-flakes>=2.0.0',
                 'pytest-pep8>=1.0.6',
-                'pytest-xdist>=1.22.2',
                 'sphinx>=1.7.1',
             ],
         },
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,7 +1,8 @@
 import time
 import pytest
-import progressbar
 import logging
+import freezegun
+import progressbar
 
 
 LOG_LEVELS = {
@@ -21,11 +22,12 @@ def pytest_configure(config):
 def small_interval(monkeypatch):
     # Remove the update limit for tests by default
     monkeypatch.setattr(
-        progressbar.ProgressBar, '_MINIMUM_UPDATE_INTERVAL', 0.000001)
+        progressbar.ProgressBar, '_MINIMUM_UPDATE_INTERVAL', 1e-6)
 
 
 @pytest.fixture(autouse=True)
 def sleep_faster(monkeypatch):
-    sleep = time.sleep
-    monkeypatch.setattr('time.sleep', lambda t: sleep(t / 1e6))
-
+    with freezegun.freeze_time() as fake_time:
+        monkeypatch.setattr('time.sleep', fake_time.tick)
+        monkeypatch.setattr('timeit.default_timer', time.time)
+        yield
diff --git a/tests/test_custom_widgets.py b/tests/test_custom_widgets.py
@@ -1,3 +1,4 @@
+import time
 import progressbar
 
 
@@ -28,16 +29,22 @@ def test_crazy_file_transfer_speed_widget():
     p.start()
     for i in range(0, 200, 5):
         # do something
+        time.sleep(0.1)
         p.update(i + 1)
     p.finish()
 
 
 def test_dynamic_message_widget():
-    widgets = [' [', progressbar.Timer(), '] ', progressbar.Bar(), ' (',
-               progressbar.ETA(), ') ', progressbar.DynamicMessage('loss')]
+    widgets = [
+        ' [', progressbar.Timer(), '] ',
+        progressbar.Bar(),
+        ' (', progressbar.ETA(), ') ',
+        progressbar.DynamicMessage('loss'),
+    ]
 
     p = progressbar.ProgressBar(widgets=widgets, max_value=1000)
     p.start()
     for i in range(0, 200, 5):
+        time.sleep(0.1)
         p.update(i + 1, loss=.5)
     p.finish()
diff --git a/tests/test_failure.py b/tests/test_failure.py
@@ -1,3 +1,4 @@
+import time
 import pytest
 import progressbar
 
@@ -20,13 +21,15 @@ def test_no_max_value():
     p = progressbar.ProgressBar()
     p.start()
     for i in range(5):
+        time.sleep(1)
         p.update(i)
 
 
 def test_correct_max_value():
     '''Looping up to 5 when max_value is 10? No problem'''
     p = progressbar.ProgressBar(max_value=10)
     for i in range(5):
+        time.sleep(1)
         p.update(i)
 
 
@@ -62,7 +65,7 @@ def test_changing_max_value():
     '''Changing max_value? No problem'''
     p = progressbar.ProgressBar(max_value=10)(range(20), max_value=20)
     for i in p:
-        pass
+        time.sleep(1)
 
 
 def test_backwards():
@@ -77,10 +80,12 @@ def test_incorrect_max_value():
     '''Looping up to 10 when max_value is 5? This is madness!'''
     p = progressbar.ProgressBar(max_value=5)
     for i in range(5):
+        time.sleep(1)
         p.update(i)
 
     with pytest.raises(ValueError):
         for i in range(5, 10):
+            time.sleep(1)
             p.update(i)
 
 
@@ -98,6 +103,7 @@ def test_unexpected_update_keyword_arg():
     p = progressbar.ProgressBar(max_value=10)
     with pytest.raises(TypeError):
         for i in range(10):
+            time.sleep(1)
             p.update(i, foo=10)
 
 
diff --git a/tests/test_monitor_progress.py b/tests/test_monitor_progress.py
@@ -1,7 +1,5 @@
-import six
-import time
 import pprint
-import progressbar
+
 pytest_plugins = 'pytester'
 
 
@@ -11,29 +9,31 @@ def test_list_example(testdir):
         best capture its stderr. We expect to see match_lines in order in the
         output.  This test is just a sanity check to ensure that the progress
         bar progresses from 1 to 10, it does not make sure that the '''
+
     v = testdir.makepyfile('''
-        import time
-        import progressbar
+    import time
+    import freezegun
+    import progressbar
 
-        bar = progressbar.ProgressBar(term_width=60)
+    with freezegun.freeze_time() as fake_time:
+        bar = progressbar.ProgressBar(term_width=65)
+        bar._MINIMUM_UPDATE_INTERVAL = 1e-9
         for i in bar(list(range(9))):
-            time.sleep(0.1)
-
+            fake_time.tick(1)
     ''')
     result = testdir.runpython(v)
     result.stderr.lines = [l for l in result.stderr.lines if l.strip()]
     pprint.pprint(result.stderr.lines)
     result.stderr.re_match_lines([
-        r'N/A% \(0 of 9\) \|\s+\| Elapsed Time: 0:00:00 ETA:  --:--:--',
-        r' 11% \(1 of 9\) \|\s+\| Elapsed Time: 0:00:00 ETA:  0:00:0[01]',
-        r' 22% \(2 of 9\) \|#+\s+\| Elapsed Time: 0:00:00 ETA:  0:00:00',
-        r' 33% \(3 of 9\) \|#+\s+\| Elapsed Time: 0:00:00 ETA:  0:00:00',
-        r' 44% \(4 of 9\) \|#+\s+\| Elapsed Time: 0:00:00 ETA:  0:00:00',
-        r' 55% \(5 of 9\) \|#+\s+\| Elapsed Time: 0:00:00 ETA:  0:00:00',
-        r' 66% \(6 of 9\) \|#+\s+\| Elapsed Time: 0:00:00 ETA:  0:00:00',
-        r' 77% \(7 of 9\) \|#+\s+\| Elapsed Time: 0:00:00 ETA:  0:00:00',
-        r' 88% \(8 of 9\) \|#+\s+\| Elapsed Time: 0:00:00 ETA:  0:00:00',
-        r'100% \(9 of 9\) \|#+\| Elapsed Time: 0:00:0[01] Time: 0:00:0[01]',
+        'N/A% (0 of 9) |            | Elapsed Time: 2:00:00 ETA:  --:--:--',
+        ' 11% (1 of 9) |#           | Elapsed Time: 2:00:01 ETA:   0:00:08',
+        ' 22% (2 of 9) |##          | Elapsed Time: 2:00:02 ETA:   0:00:07',
+        ' 33% (3 of 9) |####        | Elapsed Time: 2:00:03 ETA:   0:00:06',
+        ' 44% (4 of 9) |#####       | Elapsed Time: 2:00:04 ETA:   0:00:05',
+        ' 55% (5 of 9) |######      | Elapsed Time: 2:00:05 ETA:   0:00:04',
+        ' 66% (6 of 9) |########    | Elapsed Time: 2:00:06 ETA:   0:00:03',
+        ' 77% (7 of 9) |#########   | Elapsed Time: 2:00:07 ETA:   0:00:02',
+        ' 88% (8 of 9) |##########  | Elapsed Time: 2:00:08 ETA:   0:00:01',
     ])
 
 
@@ -43,91 +43,86 @@ def test_generator_example(testdir):
         best capture its stderr. We expect to see match_lines in order in the
         output.  This test is just a sanity check to ensure that the progress
         bar progresses from 1 to 10, it does not make sure that the '''
+
     v = testdir.makepyfile('''
-        import time
-        import progressbar
+    import time
+    import freezegun
+    import progressbar
 
+    with freezegun.freeze_time() as fake_time:
         bar = progressbar.ProgressBar(term_width=60)
+        bar._MINIMUM_UPDATE_INTERVAL = 1e-9
         for i in bar(iter(range(9))):
-            time.sleep(0.1)
-
+            fake_time.tick(1)
     ''')
     result = testdir.runpython(v)
     result.stderr.lines = [l for l in result.stderr.lines if l.strip()]
     pprint.pprint(result.stderr.lines)
-    result.stderr.re_match_lines([
-        '/ |#                               | 0 Elapsed Time: 0:00:00',
-        '- | #                              | 1 Elapsed Time: 0:00:00',
-        '\\ |  #                             | 2 Elapsed Time: 0:00:00',
-        '| |   #                            | 3 Elapsed Time: 0:00:00',
-        '/ |    #                           | 4 Elapsed Time: 0:00:00',
-        '- |     #                          | 5 Elapsed Time: 0:00:00',
-        '\\ |      #                         | 6 Elapsed Time: 0:00:00',
-        '| |       #                        | 7 Elapsed Time: 0:00:00',
-        '/ |        #                       | 8 Elapsed Time: 0:00:00',
-        '| |         #                      | 8 Elapsed Time: 0:00:00',
-    ])
+
+    lines = []
+    for i in range(9):
+        lines.append(r'[/\\|-] \|\s*#\s*\| %(i)d Elapsed Time: 2:00:%(i)02d' %
+                     dict(i=i))
+
+    result.stderr.re_match_lines(lines)
 
 
 def test_rapid_updates(testdir):
     ''' Run some example code that updates 10 times, then sleeps .1 seconds,
         this is meant to test that the progressbar progresses normally with
         this sample code, since there were issues with it in the past '''
+
     v = testdir.makepyfile('''
-        import time
-        import progressbar
+    import time
+    import freezegun
+    import progressbar
 
+    with freezegun.freeze_time() as fake_time:
         bar = progressbar.ProgressBar(term_width=60)
-        for i in bar(range(100)):
-            if i % 10 == 0:
-                time.sleep(0.1)
-
+        bar._MINIMUM_UPDATE_INTERVAL = 1e-9
+        for i in bar(range(10)):
+            if i % 2 == 0:
+                fake_time.tick(1)
     ''')
     result = testdir.runpython(v)
+    result.stderr.lines = [l for l in result.stderr.lines if l.strip()]
     pprint.pprint(result.stderr.lines)
     result.stderr.re_match_lines([
-        r'  1% \(1 of 100\)',
-        r' 11% \(11 of 100\)',
-        r' 21% \(21 of 100\)',
-        r' 31% \(31 of 100\)',
-        r' 41% \(41 of 100\)',
-        r' 51% \(51 of 100\)',
-        r' 61% \(61 of 100\)',
-        r' 71% \(71 of 100\)',
-        r' 81% \(81 of 100\)',
-        r' 91% \(91 of 100\)',
-        r'100% \(100 of 100\)'
+        'N/A% (0 of 10) |      | Elapsed Time: 2:00:00 ETA:  --:--:--',
+        ' 10% (1 of 10) |      | Elapsed Time: 2:00:01 ETA:   0:00:09',
+        ' 20% (2 of 10) |#     | Elapsed Time: 2:00:01 ETA:   0:00:08',
+        ' 30% (3 of 10) |#     | Elapsed Time: 2:00:02 ETA:   0:00:04',
+        ' 40% (4 of 10) |##    | Elapsed Time: 2:00:02 ETA:   0:00:04',
+        ' 50% (5 of 10) |###   | Elapsed Time: 2:00:03 ETA:   0:00:03',
+        ' 60% (6 of 10) |###   | Elapsed Time: 2:00:03 ETA:   0:00:02',
+        ' 70% (7 of 10) |####  | Elapsed Time: 2:00:04 ETA:   0:00:01',
+        ' 80% (8 of 10) |####  | Elapsed Time: 2:00:04 ETA:   0:00:01',
+        ' 90% (9 of 10) |##### | Elapsed Time: 2:00:05 ETA:   0:00:00',
+        '100% (10 of 10) |#####| Elapsed Time: 2:00:05 Time:  2:00:05',
     ])
 
 
 def test_context_wrapper(testdir):
-    fd = six.StringIO()
-
-    with progressbar.ProgressBar(term_width=60, fd=fd) as bar:
-        bar._MINIMUM_UPDATE_INTERVAL = 0.0001
-        for _ in bar(list(range(5))):
-            time.sleep(0.001)
-
-    expected = (
-        '',
-        '                                                            ',
-        '',
-        'N/A% (0 of 5) |       | Elapsed Time: 0:00:00 ETA:  --:--:--',
-        '                                                            ',
-        '',
-        ' 20% (1 of 5) |#       | Elapsed Time: 0:00:00 ETA:  0:00:00',
-        '                                                            ',
-        '',
-        ' 40% (2 of 5) |###     | Elapsed Time: 0:00:00 ETA:  0:00:00',
-        '                                                            ',
-        '',
-        ' 60% (3 of 5) |####    | Elapsed Time: 0:00:00 ETA:  0:00:00',
-        '                                                            ',
-        '',
-        ' 80% (4 of 5) |######  | Elapsed Time: 0:00:00 ETA:  0:00:00',
-        '                                                            ',
-        '',
-        '100% (5 of 5) |########| Elapsed Time: 0:00:00 Time: 0:00:00',
-    )
-    for line, expected_line in zip(fd.getvalue().split('\r'), expected):
-        assert line == expected_line
+    v = testdir.makepyfile('''
+    import time
+    import freezegun
+    import progressbar
+
+    with freezegun.freeze_time() as fake_time:
+        with progressbar.ProgressBar(term_width=60) as bar:
+            bar._MINIMUM_UPDATE_INTERVAL = 1e-9
+            for _ in bar(list(range(5))):
+                fake_time.tick(1)
+    ''')
+
+    result = testdir.runpython(v)
+    result.stderr.lines = [l for l in result.stderr.lines if l.strip()]
+    pprint.pprint(result.stderr.lines)
+    result.stderr.re_match_lines([
+        'N/A% (0 of 5) |       | Elapsed Time: 2:00:00 ETA:  --:--:--',
+        ' 20% (1 of 5) |#      | Elapsed Time: 2:00:01 ETA:   0:00:04',
+        ' 40% (2 of 5) |##     | Elapsed Time: 2:00:02 ETA:   0:00:03',
+        ' 60% (3 of 5) |####   | Elapsed Time: 2:00:03 ETA:   0:00:02',
+        ' 80% (4 of 5) |#####  | Elapsed Time: 2:00:04 ETA:   0:00:01',
+        '100% (5 of 5) |#######| Elapsed Time: 2:00:05 Time:  2:00:05',
+    ])
diff --git a/tests/test_samples.py b/tests/test_samples.py
diff --git a/tox.ini b/tox.ini
