summaryrefslogtreecommitdiff
path: root/distutils2/tests/test_config.py
diff options
context:
space:
mode:
author?ric Araujo <merwok@netwok.org>2011-11-12 03:18:15 +0100
committer?ric Araujo <merwok@netwok.org>2011-11-12 03:18:15 +0100
commitab9af202e257d3403cf820e4ec091d768a9ff755 (patch)
treef62838f4094b27510196f8d3a5638c7ab5e03f29 /distutils2/tests/test_config.py
parenta8791ff81a116924d6d385cf5aab2a54743855a4 (diff)
downloaddisutils2-ab9af202e257d3403cf820e4ec091d768a9ff755.tar.gz
Change signature of tests.support.LoggingCatcher.get_logs.
I need this for some tests, and it makes code clearer. This commit also changes some assertEqual calls to use (actual, expected) order and fix some pyflakes warnings.
Diffstat (limited to 'distutils2/tests/test_config.py')
-rw-r--r--distutils2/tests/test_config.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/distutils2/tests/test_config.py b/distutils2/tests/test_config.py
index 295f1ae..16fbda4 100644
--- a/distutils2/tests/test_config.py
+++ b/distutils2/tests/test_config.py
@@ -2,7 +2,6 @@
"""Tests for distutils2.config."""
import os
import sys
-import logging
from StringIO import StringIO
from distutils2 import command
@@ -376,15 +375,14 @@ class ConfigTestCase(support.TempdirManager,
self.write_file('README', 'yeah')
self.write_file('hooks.py', HOOKS_MODULE)
self.get_dist()
- logs = self.get_logs(logging.WARNING)
- self.assertEqual(['logging_hook called'], logs)
+ self.assertEqual(['logging_hook called'], self.get_logs())
self.assertIn('hooks', sys.modules)
def test_missing_setup_hook_warns(self):
self.write_setup({'setup-hooks': 'this.does._not.exist'})
self.write_file('README', 'yeah')
self.get_dist()
- logs = self.get_logs(logging.WARNING)
+ logs = self.get_logs()
self.assertEqual(1, len(logs))
self.assertIn('cannot find setup hook', logs[0])
@@ -398,7 +396,7 @@ class ConfigTestCase(support.TempdirManager,
dist = self.get_dist()
self.assertEqual(['haven', 'first', 'third'], dist.py_modules)
- logs = self.get_logs(logging.WARNING)
+ logs = self.get_logs()
self.assertEqual(1, len(logs))
self.assertIn('cannot find setup hook', logs[0])