From 683831e33bab86dd1f8d6844f7fa2aec5e12b171 Mon Sep 17 00:00:00 2001
From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Wed, 26 Jul 2017 14:30:28 +0800
Subject: Deprecate plan and metric loader

- qtip test plan is now automaticlly generated by `qtip create`. The
  original way of loading plans is no longer valid
- metric specs are now embedded in qpi spec, no separated loader are
  required now

JIRA: QTIP-258
Change-Id: I768d75b014163ce060faff00f415a1cdc437ce73
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
---
 tests/unit/loader/metric_test.py | 43 ---------------------------------
 tests/unit/loader/plan_test.py   | 52 ----------------------------------------
 2 files changed, 95 deletions(-)
 delete mode 100644 tests/unit/loader/metric_test.py
 delete mode 100644 tests/unit/loader/plan_test.py

(limited to 'tests/unit/loader')

diff --git a/tests/unit/loader/metric_test.py b/tests/unit/loader/metric_test.py
deleted file mode 100644
index 619d5e00..00000000
--- a/tests/unit/loader/metric_test.py
+++ /dev/null
@@ -1,43 +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
-##############################################################################
-
-import pytest
-
-from qtip.base.constant import BaseProp
-from qtip.loader.metric import MetricSpec
-
-
-@pytest.fixture(scope='module')
-def metric_spec(benchmarks_root):
-    return MetricSpec('dhrystone.yaml', paths=[benchmarks_root])
-
-
-def init_test(metric_spec):
-    assert metric_spec.name == 'dhrystone'
-
-    with pytest.raises(TypeError) as excinfo:
-        MetricSpec()
-    assert '__init__() takes at least 2 arguments (1 given)' \
-           in str(excinfo.value)
-
-
-def list_all_test(benchmarks_root):
-    metric_list = list(MetricSpec.list_all(paths=[benchmarks_root]))
-    assert len(metric_list) is 6
-    for desc in metric_list:
-        assert BaseProp.NAME in desc
-        assert BaseProp.ABSPATH in desc
-        assert BaseProp.ABSPATH is not None
-
-
-def content_test(metric_spec):
-    content = metric_spec.content
-    assert BaseProp.NAME in content
-    assert BaseProp.WORKLOADS in content
-    assert isinstance(content[BaseProp.WORKLOADS], list)
diff --git a/tests/unit/loader/plan_test.py b/tests/unit/loader/plan_test.py
deleted file mode 100644
index 4c92e8d5..00000000
--- a/tests/unit/loader/plan_test.py
+++ /dev/null
@@ -1,52 +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
-##############################################################################
-
-import pytest
-
-from qtip.collector.logfile import LogfileCollector
-from qtip.loader.plan import load_collector
-from qtip.loader.plan import Plan
-from qtip.loader.plan import PlanProp
-
-
-def test_construct(benchmarks_root):
-    sample = Plan('sample.yaml')
-    assert isinstance(sample, Plan)
-
-    # fixture can not be used in pytest.mark.parametrized
-    sample = Plan('sample.yaml', [benchmarks_root])
-    assert isinstance(sample, Plan)
-
-
-def test_invalid_construct():
-    with pytest.raises(TypeError) as excinfo:
-        Plan()
-    assert '__init__() takes at least 2 arguments (1 given)' \
-           in str(excinfo.value)
-
-
-def test_list_all(benchmarks_root):
-    plan_list = list(Plan.list_all(paths=[benchmarks_root]))
-    assert len(plan_list) is 3
-    for desc in plan_list:
-        assert PlanProp.NAME in desc
-        assert PlanProp.ABSPATH in desc
-        assert PlanProp.ABSPATH is not None
-
-
-def test_content(plan):
-    content = plan.content
-    assert PlanProp.NAME in content
-    assert PlanProp.DESCRIPTION in content
-    assert PlanProp.CONFIG in content
-    assert PlanProp.QPIS in content
-
-
-def test_load_collector():
-    assert load_collector(LogfileCollector.TYPE) is LogfileCollector
-- 
cgit 1.2.3-korg