From 12b511e16100084420f08591cc03f50308ddf164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= <contact@ionelmc.ro>
Date: Fri, 19 Dec 2014 12:35:46 +0200
Subject: [PATCH] More test improvements.

---
 .travis.yml                   | 15 ++++++++++-----
 src/pytest_benchmark/stats.py |  4 ++--
 tests/test_no_run_broken.t    |  6 +++---
 tests/test_stats.py           |  7 ++-----
 tox.ini                       |  9 ++++++---
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7c1e1a5..be1abda 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,16 @@ env:
     LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
   matrix:
     - TOXENV=check
-    - TOXENV=py26
-    - TOXENV=py27
-    - TOXENV=py33
-    - TOXENV=py34
-    - TOXENV=pypy
+    - TOXENV=py26-pytest25
+    - TOXENV=py27-pytest25
+    - TOXENV=py33-pytest25
+    - TOXENV=py34-pytest25
+    - TOXENV=pypy-pytest25
+    - TOXENV=py26-pytest26
+    - TOXENV=py27-pytest26
+    - TOXENV=py33-pytest26
+    - TOXENV=py34-pytest26
+    - TOXENV=pypy-pytest26
 before_install:
   - python --version
   - uname -a
diff --git a/src/pytest_benchmark/stats.py b/src/pytest_benchmark/stats.py
index 1466d25..38b014d 100644
--- a/src/pytest_benchmark/stats.py
+++ b/src/pytest_benchmark/stats.py
@@ -43,6 +43,6 @@ def stddev(self):
         return math.sqrt(self.variance)
 
     def __str__(self):
-        return "Stats[%s runs in %.4fsec, min=%.4fsec, max=%.4fsec, avg=%.4fsec, mean=%.4fsec, stddev=%.4fsec]" % (
-            self.runs, self.total, self.min, self.max, self.avg, self.mean, self.stddev
+        return "Stats[%s runs in %.4fsec, min=%.4fsec, max=%.4fsec, mean=%.4fsec, stddev=%.4fsec]" % (
+            self.runs, self.total, self.min, self.max, self.mean, self.stddev
         )
diff --git a/tests/test_no_run_broken.t b/tests/test_no_run_broken.t
index aca5f24..0201f2a 100644
--- a/tests/test_no_run_broken.t
+++ b/tests/test_no_run_broken.t
@@ -80,15 +80,15 @@ Test that we don't benchmark code that raises exceptions:
           def result():
               raise Exception()
   \s* (re)
-  tests.py:8:
-  _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
+  tests.py:.* (re)
+  (_ )+ (re)
   .*pytest_benchmark/plugin.py:.*: in __call__ (re)
       duration, scale = self._calibrate_timer(runner)
   .*pytest_benchmark/plugin.py:.*: in _calibrate_timer (re)
       duration = runner(loops)
   .*pytest_benchmark/plugin.py:.*: in runner (re)
       function_to_benchmark()
-  _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
+  (_ )+ (re)
   \s* (re)
       @benchmark
       def result():
diff --git a/tests/test_stats.py b/tests/test_stats.py
index ad5804d..e8d8d10 100644
--- a/tests/test_stats.py
+++ b/tests/test_stats.py
@@ -5,14 +5,11 @@ def test_1():
     stats = RunningStats()
     for i in 4., 36., 45., 50., 75.:
         stats.update(i)
-    print(stats)
-    fail
+    assert stats.mean == 42.0
 
 def test_2():
     stats = RunningStats()
-
     stats.update(17.0)
     stats.update(19.0)
     stats.update(24.0)
-    print(stats)
-    fail
+    assert stats.mean == 20.0
diff --git a/tox.ini b/tox.ini
index ac656bf..7fff002 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
     check,
-    {py26,py27,py33,py34,pypy},
+    {py26,py27,py33,py34,pypy}-{pytest25,pytest26},
     docs
 
 [testenv]
@@ -17,11 +17,14 @@ setenv =
     PYTHONUNBUFFERED=yes
 deps =
     cram==0.6
-    pytest==2.6.4
+    pytest25: pytest==2.5.2
+    pytest26: pytest==2.6.4
     pytest-cov==1.8.1
 
 testspath = {toxinidir}/tests/test_pytest_benchmark.py
-commands = {posargs:cram --verbose tests}
+commands =
+    {posargs:py.test tests}
+    cram --verbose tests
 usedevelop = true
 
 [testenv:spell]