Merge branch 'develop' of github.com:WoLpH/python-progressbar into develop

Author: wolph

tests/test_timed.py

@@ -122,18 +122,18 @@ def calculate_eta(self, value, elapsed):
             time.sleep(10)
     p.finish()
 
-    import pprint
-    pprint.pprint(datas)
+    # Due to weird travis issues, the actual testing is disabled for now
+    # import pprint
+    # pprint.pprint(datas[::2])
+    # pprint.pprint(datas[1::2])
 
-    # TODO: for some reason the monkeypatching above doesn't properly work when
-    # running from Travis. Once this is fixed we'll re-enable this.
     # for i, (a, b) in enumerate(zip(datas[::2], datas[1::2])):
     #     # Because the speed is identical initially, the results should be the
     #     # same for adaptive and regular transfer speed. Only when the speed
     #     # changes we should start see a lot of differences between the two
     #     if i < (n / 2 - 1):
     #         assert a['elapsed'] == b['elapsed']
-    #     else:
+    #     if i > (n / 2 + 1):
     #         assert a['elapsed'] > b['elapsed']