mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-05-29 01:31:29 +00:00
test: remove unneeded stuff in test/__init__.py
Signed-off-by: Dan Streetman <ddstreet@canonical.com>
This commit is contained in:
parent
ae74f71a1e
commit
12c2e6bf42
2
setup.py
2
setup.py
@ -80,5 +80,5 @@ if __name__ == '__main__':
|
|||||||
'ubuntutools/test',
|
'ubuntutools/test',
|
||||||
],
|
],
|
||||||
data_files=data_files,
|
data_files=data_files,
|
||||||
test_suite='ubuntutools.test.discover',
|
test_suite='ubuntutools.test',
|
||||||
)
|
)
|
||||||
|
@ -1,66 +0,0 @@
|
|||||||
# Copyright (C) 2010, Stefano Rivera <stefanor@ubuntu.com>
|
|
||||||
# Copyright (C) 2017, Benjamin Drung <benjamin.drung@profitbricks.com>
|
|
||||||
#
|
|
||||||
# Permission to use, copy, modify, and/or distribute this software for any
|
|
||||||
# purpose with or without fee is hereby granted, provided that the above
|
|
||||||
# copyright notice and this permission notice appear in all copies.
|
|
||||||
#
|
|
||||||
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
|
||||||
# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
|
||||||
# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
|
||||||
# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
|
||||||
# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
||||||
# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
||||||
# PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
|
|
||||||
"""Test suite for ubuntutools"""
|
|
||||||
|
|
||||||
import inspect
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
|
|
||||||
import setup
|
|
||||||
|
|
||||||
import unittest
|
|
||||||
|
|
||||||
|
|
||||||
def discover():
|
|
||||||
# import __main__ triggers code re-execution
|
|
||||||
__main__ = sys.modules['__main__']
|
|
||||||
setupDir = os.path.abspath(os.path.dirname(__main__.__file__))
|
|
||||||
return unittest.defaultTestLoader.discover(setupDir)
|
|
||||||
|
|
||||||
|
|
||||||
def get_source_files():
|
|
||||||
"""Return a list of sources files/directories (to check with flake8/pylint)"""
|
|
||||||
modules = ["ubuntutools"]
|
|
||||||
py_files = ["setup.py"]
|
|
||||||
|
|
||||||
files = []
|
|
||||||
for code_file in setup.scripts + modules + py_files:
|
|
||||||
is_script = code_file in setup.scripts
|
|
||||||
if not os.path.exists(code_file): # pragma: no cover
|
|
||||||
# The alternative path is needed for Debian's pybuild
|
|
||||||
alternative = os.path.join(os.environ.get("OLDPWD", ""), code_file)
|
|
||||||
code_file = alternative if os.path.exists(alternative) else code_file
|
|
||||||
if is_script:
|
|
||||||
with open(code_file, "rb") as script_file:
|
|
||||||
shebang = script_file.readline().decode("utf-8")
|
|
||||||
if "python3" in shebang:
|
|
||||||
files.append(code_file)
|
|
||||||
else:
|
|
||||||
files.append(code_file)
|
|
||||||
return files
|
|
||||||
|
|
||||||
|
|
||||||
def unittest_verbosity():
|
|
||||||
"""Return the verbosity setting of the currently running unittest
|
|
||||||
program, or None if none is running.
|
|
||||||
"""
|
|
||||||
frame = inspect.currentframe()
|
|
||||||
while frame:
|
|
||||||
self = frame.f_locals.get("self")
|
|
||||||
if isinstance(self, unittest.TestProgram):
|
|
||||||
return self.verbosity
|
|
||||||
frame = frame.f_back
|
|
||||||
return None # pragma: no cover
|
|
@ -18,11 +18,11 @@
|
|||||||
import os.path
|
import os.path
|
||||||
import shutil
|
import shutil
|
||||||
import tempfile
|
import tempfile
|
||||||
|
import unittest
|
||||||
|
|
||||||
from io import BytesIO
|
from io import BytesIO
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
import ubuntutools.archive
|
import ubuntutools.archive
|
||||||
from ubuntutools.test import unittest
|
|
||||||
|
|
||||||
from ubuntutools.test.example_package import ExamplePackage
|
from ubuntutools.test.example_package import ExamplePackage
|
||||||
|
|
||||||
|
@ -18,11 +18,12 @@
|
|||||||
import locale
|
import locale
|
||||||
import os
|
import os
|
||||||
# import sys
|
# import sys
|
||||||
|
import unittest
|
||||||
|
|
||||||
from io import StringIO
|
from io import StringIO
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
from ubuntutools.config import UDTConfig, ubu_email
|
from ubuntutools.config import UDTConfig, ubu_email
|
||||||
from ubuntutools.test import unittest
|
|
||||||
|
|
||||||
|
|
||||||
class ConfigTestCase(unittest.TestCase):
|
class ConfigTestCase(unittest.TestCase):
|
||||||
|
@ -20,9 +20,9 @@ import select
|
|||||||
import signal
|
import signal
|
||||||
import subprocess
|
import subprocess
|
||||||
import time
|
import time
|
||||||
|
import unittest
|
||||||
|
|
||||||
import setup
|
import setup
|
||||||
from ubuntutools.test import unittest
|
|
||||||
|
|
||||||
TIMEOUT = 10
|
TIMEOUT = 10
|
||||||
|
|
||||||
|
@ -18,10 +18,11 @@
|
|||||||
|
|
||||||
import os
|
import os
|
||||||
# import sys
|
# import sys
|
||||||
|
import unittest
|
||||||
|
|
||||||
from io import StringIO
|
from io import StringIO
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
from ubuntutools.test import unittest
|
|
||||||
from ubuntutools.update_maintainer import update_maintainer
|
from ubuntutools.update_maintainer import update_maintainer
|
||||||
|
|
||||||
_LUCID_CHANGELOG = """\
|
_LUCID_CHANGELOG = """\
|
||||||
|
Loading…
x
Reference in New Issue
Block a user