From fc95a8868d1c4168cb900bc7e2004b557f757bf9 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Fri, 17 Feb 2017 18:39:28 +0800 Subject: [PATCH] Clean up tests folder - remove __init__.py as recommended in pytest docs[1] - rename cli test files for a consistent naming style - remove empty test files [1]: http://docs.pytest.org/en/latest/goodpractices.html#choosing-a-test-layout-import-rules Change-Id: Idfb5d8a8fb7a590ef988a761991b8e313089e9bc Signed-off-by: Yujun Zhang --- tests/__init__.py | 18 ------------------ tests/unit/__init__.py | 0 tests/unit/cli/__init__.py | 0 tests/unit/cli/{test_metric.py => cmd_metric_test.py} | 0 tests/unit/cli/{test_plan.py => cmd_plan_test.py} | 0 tests/unit/cli/{test_qpi.py => cmd_qpi_test.py} | 0 tests/unit/cli/{test_options.py => options_test.py} | 0 tests/unit/collector/transformer/__init__.py | 0 tests/unit/loader/__init__.py | 0 tests/unit/runner/__init__.py | 0 10 files changed, 18 deletions(-) delete mode 100644 tests/__init__.py delete mode 100644 tests/unit/__init__.py delete mode 100644 tests/unit/cli/__init__.py rename tests/unit/cli/{test_metric.py => cmd_metric_test.py} (100%) rename tests/unit/cli/{test_plan.py => cmd_plan_test.py} (100%) rename tests/unit/cli/{test_qpi.py => cmd_qpi_test.py} (100%) rename tests/unit/cli/{test_options.py => options_test.py} (100%) delete mode 100644 tests/unit/collector/transformer/__init__.py delete mode 100644 tests/unit/loader/__init__.py delete mode 100644 tests/unit/runner/__init__.py diff --git a/tests/__init__.py b/tests/__init__.py deleted file mode 100644 index d6d2dee5..00000000 --- a/tests/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################## -# Copyright (c) 2016 ZTE Corp and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -from os import path - - -class BaseTest(object): - PATH = path.abspath(path.join(path.dirname(__file__), 'data')) - - @classmethod - def abspath(cls, name): - return path.join(cls.PATH, name) diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/unit/cli/__init__.py b/tests/unit/cli/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/unit/cli/test_metric.py b/tests/unit/cli/cmd_metric_test.py similarity index 100% rename from tests/unit/cli/test_metric.py rename to tests/unit/cli/cmd_metric_test.py diff --git a/tests/unit/cli/test_plan.py b/tests/unit/cli/cmd_plan_test.py similarity index 100% rename from tests/unit/cli/test_plan.py rename to tests/unit/cli/cmd_plan_test.py diff --git a/tests/unit/cli/test_qpi.py b/tests/unit/cli/cmd_qpi_test.py similarity index 100% rename from tests/unit/cli/test_qpi.py rename to tests/unit/cli/cmd_qpi_test.py diff --git a/tests/unit/cli/test_options.py b/tests/unit/cli/options_test.py similarity index 100% rename from tests/unit/cli/test_options.py rename to tests/unit/cli/options_test.py diff --git a/tests/unit/collector/transformer/__init__.py b/tests/unit/collector/transformer/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/unit/loader/__init__.py b/tests/unit/loader/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/unit/runner/__init__.py b/tests/unit/runner/__init__.py deleted file mode 100644 index e69de29b..00000000 -- 2.16.6