From 8b5ca253ec376aa3be484ba376236a218ba38368 Mon Sep 17 00:00:00 2001
From: "Mr. Outis" <mroutis@protonmail.com>
Date: Mon, 2 Dec 2019 22:47:31 -0600
Subject: [PATCH] analytics: move report schema to tests

---
 dvc/analytics.py             | 15 +--------------
 tests/unit/test_analytics.py | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/dvc/analytics.py b/dvc/analytics.py
index 4a4a4060b..7939ba5c3 100644
--- a/dvc/analytics.py
+++ b/dvc/analytics.py
@@ -6,7 +6,6 @@ import sys
 import uuid
 
 import distro
-from voluptuous import Schema, Any
 
 from dvc import __version__
 from dvc.config import Config, to_bool
@@ -15,23 +14,11 @@ from dvc.lock import Lock, LockError
 from dvc.repo import Repo
 from dvc.scm import SCM
 from dvc.utils import env2bool, is_binary, makedirs
-from dvc.utils.compat import builtin_str, str, FileNotFoundError, fspath_py35
+from dvc.utils.compat import str, FileNotFoundError, fspath_py35
 
 
 logger = logging.getLogger(__name__)
 
-report_schema = Schema(
-    {
-        "cmd_class": Any(str, None),
-        "cmd_return_code": Any(int, None),
-        "dvc_version": Any(builtin_str, str),
-        "is_binary": bool,
-        "scm_class": Any("Git", None),
-        "user_id": Any(builtin_str, str),
-        "system_info": dict,
-    }
-)
-
 
 def collect(args=None, return_code=None):
     """
diff --git a/tests/unit/test_analytics.py b/tests/unit/test_analytics.py
index e62c6e7b5..7a864bfa3 100644
--- a/tests/unit/test_analytics.py
+++ b/tests/unit/test_analytics.py
@@ -2,8 +2,10 @@ import json
 import pytest
 import mock
 
+from voluptuous import Schema, Any
+
 from dvc import analytics
-from dvc.utils.compat import str
+from dvc.utils.compat import str, builtin_str
 
 
 @pytest.fixture
@@ -18,8 +20,20 @@ def tmp_global_config(tmp_path):
 
 
 def test_collect(tmp_global_config):
+    schema = Schema(
+        {
+            "cmd_class": Any(str, None),
+            "cmd_return_code": Any(int, None),
+            "dvc_version": Any(builtin_str, str),
+            "is_binary": bool,
+            "scm_class": Any("Git", None),
+            "user_id": Any(builtin_str, str),
+            "system_info": dict,
+        }
+    )
+
     report = analytics.collect(return_code=0)
-    assert analytics.report_schema(report)
+    assert schema(report)
 
 
 @mock.patch("requests.post")