Commit 17da6e99 authored by Alex Willmer's avatar Alex Willmer Committed by David Wilson

Use unittest2 in all tests

This allows using features such as TestCase,assertIsInstance on Python
2.6 and earlier.
parent d743823a
import logging
import time
import unittest
import unittest2 as unittest
import mitogen.core
import mitogen.master
......
import unittest
import unittest2 as unittest
import mitogen.core
import testlib
......
import os
import shutil
import unittest
import unittest2 as unittest
import mitogen.fakessh
......
import subprocess
import unittest
import unittest2 as unittest
import mitogen.master
import testlib
......
import unittest
import unittest2 as unittest
import testlib
import id_allocation
......
......@@ -2,11 +2,11 @@
import email.utils
import sys
import types
import unittest
import zlib
import mock
import pytest
import unittest2 as unittest
import mitogen.core
import testlib
......
import os
import unittest
import unittest2 as unittest
import mitogen
import mitogen.ssh
......
import subprocess
import time
import unittest
import unittest2 as unittest
import testlib
import mitogen.master
......@@ -15,7 +16,7 @@ class ScanCodeImportsTest(unittest.TestCase):
self.assertEquals(list(self.func(co)), [
(-1, 'subprocess', ()),
(-1, 'time', ()),
(-1, 'unittest', ()),
(-1, 'unittest2', ()),
(-1, 'testlib', ()),
(-1, 'mitogen.master', ()),
])
......
import inspect
import unittest
import unittest2 as unittest
import mitogen.master
......
import os
import unittest
import unittest2 as unittest
import testlib
......
import mock
import subprocess
import unittest
import sys
import unittest2 as unittest
import mitogen.master
import testlib
......
import unittest
import unittest2 as unittest
import mitogen.master
import testlib
......
import unittest
import mitogen
import mitogen.ssh
import mitogen.utils
import unittest2 as unittest
import testlib
import plain_old_module
......
......@@ -5,9 +5,10 @@ import re
import socket
import sys
import time
import unittest
import urlparse
import unittest2 as unittest
import mitogen.master
if mitogen.is_master: # TODO: shouldn't be necessary.
import docker
......
#!/usr/bin/env python
import unittest
import unittest2 as unittest
import mitogen.master
import mitogen.utils
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment