metrics: don't forget to checkout()

Signed-off-by: Ruslan Kuprieiev <kupruser@gmail.com>
iterative · Apr 20, 2018 · 5985fd3 · 5985fd3
1 parent 9bd8354
commit 5985fd3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/dvc/project.py b/dvc/project.py
@@ -309,11 +309,13 @@ def metrics(self, path, json_path=None, tsv_path=None, htsv_path=None):
         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
@@ -4,6 +4,7 @@
 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 @@ def test(self):
         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'])