From 5985fd3c96f04ffb921894029dff34a070be1784 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Fri, 20 Apr 2018 09:04:25 +0300 Subject: [PATCH] metrics: don't forget to checkout() Signed-off-by: Ruslan Kuprieiev --- dvc/project.py | 2 ++ tests/test_metrics.py | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dvc/project.py b/dvc/project.py index 7f90bcdf4..a56ba406c 100644 --- a/dvc/project.py +++ b/dvc/project.py @@ -309,11 +309,13 @@ class Project(object): saved = self.scm.active_branch() for branch in self.scm.list_branches(): self.scm.checkout(branch) + self.checkout() res[branch] = self._read_metric(path, json_path=json_path, tsv_path=tsv_path, htsv_path=htsv_path) self.scm.checkout(saved) + self.checkout() return res def graph(self): diff --git a/tests/test_metrics.py b/tests/test_metrics.py index 71b3e95bb..43df34753 100644 --- a/tests/test_metrics.py +++ b/tests/test_metrics.py @@ -4,6 +4,7 @@ import json from dvc.main import main from tests.basic_env import TestDvc + class TestMetrics(TestDvc): def setUp(self): super(TestMetrics, self).setUp() @@ -57,9 +58,14 @@ class TestMetrics(TestDvc): self.assertTrue(ret['bar'] == ['bar']) self.assertTrue(ret['baz'] == ['baz']) - def test_cli(self): + +class TestMetricsCLI(TestMetrics): + def test(self): + #FIXME enable on windows + if os.name == 'nt': + return #FIXME check output - ret = main(['metrics', 'metric']) + ret = main(['metrics', 'metric', '-v']) self.assertEqual(ret, 0) ret = main(['metrics', 'metric_json', '--json-path', 'branch'])