From: Dylan Baker <baker.dyla...@gmail.com> Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com> --- framework/tests/backends_tests.py | 2 +- framework/tests/base_tests.py | 2 +- framework/tests/compressed_backend_tests.py | 2 +- framework/tests/core_tests.py | 2 +- framework/tests/deqp_tests.py | 2 +- framework/tests/exceptions_tests.py | 2 +- framework/tests/gleantest_tests.py | 2 +- framework/tests/glsl_parser_test_tests.py | 2 +- framework/tests/grouptools_tests.py | 2 +- framework/tests/gtest_tests.py | 2 +- framework/tests/json_backend_tests.py | 2 +- framework/tests/json_results_update_tests.py | 2 +- framework/tests/json_tests.py | 2 +- framework/tests/junit_backends_tests.py | 2 +- framework/tests/log_tests.py | 2 +- framework/tests/oglconform_tests.py | 2 +- framework/tests/opencv_tests.py | 2 +- framework/tests/opengl_tests.py | 2 +- framework/tests/piglit_test_tests.py | 2 +- framework/tests/profile_tests.py | 2 +- framework/tests/results_tests.py | 2 +- framework/tests/run_parser_tests.py | 2 +- framework/tests/shader_test_tests.py | 2 +- framework/tests/status_tests.py | 2 +- framework/tests/summary_common_tests.py | 2 +- framework/tests/summary_html_tests.py | 2 +- framework/tests/test_lists.py | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/framework/tests/backends_tests.py b/framework/tests/backends_tests.py index 61169e8..29e9a18 100644 --- a/framework/tests/backends_tests.py +++ b/framework/tests/backends_tests.py @@ -28,7 +28,7 @@ import os import nose.tools as nt from framework import backends, options -import framework.tests.utils as utils +from . import utils BACKEND_INITIAL_META = { diff --git a/framework/tests/base_tests.py b/framework/tests/base_tests.py index 20bea87..aded29f 100644 --- a/framework/tests/base_tests.py +++ b/framework/tests/base_tests.py @@ -26,7 +26,7 @@ import mock import nose.tools as nt from nose.plugins.attrib import attr -import framework.tests.utils as utils +from . import utils from framework.test.base import ( Test, TestRunError, diff --git a/framework/tests/compressed_backend_tests.py b/framework/tests/compressed_backend_tests.py index 42d5ab9..3e1582e 100644 --- a/framework/tests/compressed_backend_tests.py +++ b/framework/tests/compressed_backend_tests.py @@ -33,7 +33,7 @@ import nose.tools as nt from nose.plugins.skip import SkipTest from framework import results -from framework.tests import utils +from . import utils from framework.backends import compression, abstract # pylint: disable=line-too-long,protected-access diff --git a/framework/tests/core_tests.py b/framework/tests/core_tests.py index a4b366a..2699a14 100644 --- a/framework/tests/core_tests.py +++ b/framework/tests/core_tests.py @@ -30,7 +30,7 @@ import functools import nose.tools as nt from framework import core, exceptions -import framework.tests.utils as utils +from . import utils # pylint: disable=line-too-long,invalid-name diff --git a/framework/tests/deqp_tests.py b/framework/tests/deqp_tests.py index 8d0a93a..0ae44f2 100644 --- a/framework/tests/deqp_tests.py +++ b/framework/tests/deqp_tests.py @@ -32,7 +32,7 @@ import nose.tools as nt from framework import profile, grouptools, exceptions from framework.test import deqp -from framework.tests import utils +from . import utils # pylint:disable=line-too-long,invalid-name diff --git a/framework/tests/exceptions_tests.py b/framework/tests/exceptions_tests.py index 66fd8e6..d1db6b5 100644 --- a/framework/tests/exceptions_tests.py +++ b/framework/tests/exceptions_tests.py @@ -24,7 +24,7 @@ from __future__ import print_function, absolute_import, division import nose.tools as nt -from framework.tests import utils +from . import utils from framework import exceptions diff --git a/framework/tests/gleantest_tests.py b/framework/tests/gleantest_tests.py index 7a9f30f..fa732d5 100644 --- a/framework/tests/gleantest_tests.py +++ b/framework/tests/gleantest_tests.py @@ -27,7 +27,7 @@ import nose.tools as nt from framework.options import _Options as Options from framework.test import GleanTest -from framework.tests import utils +from . import utils from framework.test.base import TestIsSkip diff --git a/framework/tests/glsl_parser_test_tests.py b/framework/tests/glsl_parser_test_tests.py index b837723..9d2d978 100644 --- a/framework/tests/glsl_parser_test_tests.py +++ b/framework/tests/glsl_parser_test_tests.py @@ -29,7 +29,7 @@ import nose.tools as nt from framework import exceptions import framework.test.glsl_parser_test as glsl -import framework.tests.utils as utils +from . import utils from framework.test import TEST_BIN_DIR # pylint: disable=line-too-long,invalid-name diff --git a/framework/tests/grouptools_tests.py b/framework/tests/grouptools_tests.py index 36dd61c..3c92d8e 100644 --- a/framework/tests/grouptools_tests.py +++ b/framework/tests/grouptools_tests.py @@ -25,7 +25,7 @@ from __future__ import print_function import nose.tools as nt import framework.grouptools as grouptools -import framework.tests.utils as utils +from . import utils doc_formatter = utils.DocFormatter({ # pylint: disable=invalid-name 'separator': grouptools.SEPARATOR, diff --git a/framework/tests/gtest_tests.py b/framework/tests/gtest_tests.py index 9927bb9..8dd6545 100644 --- a/framework/tests/gtest_tests.py +++ b/framework/tests/gtest_tests.py @@ -24,7 +24,7 @@ from __future__ import print_function, absolute_import import nose.tools as nt -from framework.tests import utils +from . import utils from framework.test import GTest diff --git a/framework/tests/json_backend_tests.py b/framework/tests/json_backend_tests.py index 26f5db9..066122a 100644 --- a/framework/tests/json_backend_tests.py +++ b/framework/tests/json_backend_tests.py @@ -32,7 +32,7 @@ except ImportError: import nose.tools as nt from framework import results, backends, exceptions, grouptools -import framework.tests.utils as utils +from . import utils from .backends_tests import BACKEND_INITIAL_META diff --git a/framework/tests/json_results_update_tests.py b/framework/tests/json_results_update_tests.py index 4f7a59c..33a30bc 100644 --- a/framework/tests/json_results_update_tests.py +++ b/framework/tests/json_results_update_tests.py @@ -31,7 +31,7 @@ except ImportError: import json import nose.tools as nt -import framework.tests.utils as utils +from . import utils from framework import backends, results # Disable some errors that cannot be fixed either because tests need to probe diff --git a/framework/tests/json_tests.py b/framework/tests/json_tests.py index 2fa03a9..417b46a 100644 --- a/framework/tests/json_tests.py +++ b/framework/tests/json_tests.py @@ -35,7 +35,7 @@ try: except ImportError: import json -import framework.tests.utils as utils +from . import utils from framework import results from framework.backends.json import JSONBackend from framework.programs.run import _create_metadata diff --git a/framework/tests/junit_backends_tests.py b/framework/tests/junit_backends_tests.py index 40c59ed..b6913e7 100644 --- a/framework/tests/junit_backends_tests.py +++ b/framework/tests/junit_backends_tests.py @@ -33,7 +33,7 @@ import nose.tools as nt from nose.plugins.skip import SkipTest from framework import results, backends, grouptools, status -import framework.tests.utils as utils +from . import utils from .backends_tests import BACKEND_INITIAL_META diff --git a/framework/tests/log_tests.py b/framework/tests/log_tests.py index d1ba7cf..1f1cf33 100644 --- a/framework/tests/log_tests.py +++ b/framework/tests/log_tests.py @@ -28,7 +28,7 @@ import threading import nose.tools as nt import framework.log as log -import framework.tests.utils as utils +from . import utils TEST_STATE = {'total': 0, 'complete': 0, 'lastlength': 0, 'running': [], 'summary': collections.defaultdict(lambda: 0)} diff --git a/framework/tests/oglconform_tests.py b/framework/tests/oglconform_tests.py index 8e614df..35a4bdf 100644 --- a/framework/tests/oglconform_tests.py +++ b/framework/tests/oglconform_tests.py @@ -25,7 +25,7 @@ from StringIO import StringIO import mock import nose.tools as nt -from framework.tests import utils +from . import utils from framework import grouptools with mock.patch('framework.core.PIGLIT_CONFIG.required_get', diff --git a/framework/tests/opencv_tests.py b/framework/tests/opencv_tests.py index 6e106e3..648f978 100644 --- a/framework/tests/opencv_tests.py +++ b/framework/tests/opencv_tests.py @@ -22,7 +22,7 @@ from __future__ import print_function, absolute_import -from framework.tests import utils +from . import utils from framework.test import OpenCVTest diff --git a/framework/tests/opengl_tests.py b/framework/tests/opengl_tests.py index 97daf2b..4cf840b 100644 --- a/framework/tests/opengl_tests.py +++ b/framework/tests/opengl_tests.py @@ -26,7 +26,7 @@ import subprocess import mock import nose.tools as nt -import framework.tests.utils as utils +from . import utils from framework.test import opengl from framework.test.base import TestIsSkip diff --git a/framework/tests/piglit_test_tests.py b/framework/tests/piglit_test_tests.py index e7adf21..1866296 100644 --- a/framework/tests/piglit_test_tests.py +++ b/framework/tests/piglit_test_tests.py @@ -25,7 +25,7 @@ from __future__ import print_function, absolute_import import mock import nose.tools as nt -from framework.tests import utils +from . import utils from framework.options import _Options as Options from framework.test.base import TestIsSkip from framework.test.piglit_test import (PiglitBaseTest, PiglitGLTest, diff --git a/framework/tests/profile_tests.py b/framework/tests/profile_tests.py index 3a7d68b..3d78afb 100644 --- a/framework/tests/profile_tests.py +++ b/framework/tests/profile_tests.py @@ -27,7 +27,7 @@ import copy import mock import nose.tools as nt -from framework.tests import utils +from . import utils from framework import grouptools, dmesg, profile, exceptions, options from framework.test import GleanTest diff --git a/framework/tests/results_tests.py b/framework/tests/results_tests.py index 83c2ae2..bae4c3c 100644 --- a/framework/tests/results_tests.py +++ b/framework/tests/results_tests.py @@ -26,7 +26,7 @@ from __future__ import print_function, absolute_import import nose.tools as nt from framework import results, status, exceptions, grouptools -import framework.tests.utils as utils +from . import utils def dict_eq(one, two): diff --git a/framework/tests/run_parser_tests.py b/framework/tests/run_parser_tests.py index 5f0b21b..3dd87cc 100644 --- a/framework/tests/run_parser_tests.py +++ b/framework/tests/run_parser_tests.py @@ -28,7 +28,7 @@ import shutil import nose.tools as nt from framework import core, exceptions -import framework.tests.utils as utils +from . import utils import framework.programs.run as run diff --git a/framework/tests/shader_test_tests.py b/framework/tests/shader_test_tests.py index 25ae60d..1c9cec8 100644 --- a/framework/tests/shader_test_tests.py +++ b/framework/tests/shader_test_tests.py @@ -28,7 +28,7 @@ import nose.tools as nt from framework import exceptions import framework.test as testm -import framework.tests.utils as utils +from . import utils # pylint: disable=invalid-name diff --git a/framework/tests/status_tests.py b/framework/tests/status_tests.py index e3a22f5..c3c3b8a 100644 --- a/framework/tests/status_tests.py +++ b/framework/tests/status_tests.py @@ -31,7 +31,7 @@ import itertools import nose.tools as nt import framework.status as status -import framework.tests.utils as utils +from . import utils # pylint: disable=expression-not-assigned,invalid-name,line-too-long diff --git a/framework/tests/summary_common_tests.py b/framework/tests/summary_common_tests.py index 665917b..81dd921 100644 --- a/framework/tests/summary_common_tests.py +++ b/framework/tests/summary_common_tests.py @@ -28,7 +28,7 @@ import nose.tools as nt from framework import results, status, grouptools from framework.summary import common as summary -from framework.tests import utils +from . import utils def test_find_diffs(): diff --git a/framework/tests/summary_html_tests.py b/framework/tests/summary_html_tests.py index d654ba0..c202b60 100644 --- a/framework/tests/summary_html_tests.py +++ b/framework/tests/summary_html_tests.py @@ -28,7 +28,7 @@ import os import nose.tools as nt from framework.summary import html_ -from framework.tests import utils +from . import utils @utils.test_in_tempdir diff --git a/framework/tests/test_lists.py b/framework/tests/test_lists.py index f1eac6b..e56714b 100644 --- a/framework/tests/test_lists.py +++ b/framework/tests/test_lists.py @@ -32,7 +32,7 @@ import os.path as path from nose.plugins.skip import SkipTest -import framework.tests.utils as utils +from . import utils @utils.nose_generator -- 2.6.4 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit