test: get: inline erepo with non-dvc master

Author: pared

tests/func/test_get.py

@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 
 import filecmp
+import logging
 import os
 
 import pytest
@@ -90,31 +91,36 @@ def test_get_to_dir(dname, erepo):
     assert filecmp.cmp(erepo.FOO, dst, shallow=False)
 
 
-@pytest.fixture
-def erepo_no_dvc_master(git_erepo):
+def test_get_from_non_dvc_master(empty_dir, git_erepo, caplog):
+    storage = empty_dir.mkdtemp()
+
     dvc_branch = "dvc_test"
     git_erepo.git.git.checkout("master", b=dvc_branch)
-    git_erepo.dvc_branch = dvc_branch
 
     dvc_repo = Repo.init(git_erepo._root_dir)
     stage, = dvc_repo.add([git_erepo.FOO])
-    dvc_repo.scm.add([".dvc", stage.relpath])
 
     rconfig = RemoteConfig(dvc_repo.config)
-    rconfig.add("upstream", dvc_repo.cache.local.cache_dir, default=True)
+    rconfig.add("upstream", storage, default=True)
+
+    dvc_repo.push()
     dvc_repo.scm.add([dvc_repo.config.config_file])
 
+    dvc_repo.scm.add([".dvc", stage.relpath])
     dvc_repo.scm.commit("dvc branch initial")
 
     git_erepo.git.git.checkout("master")
-    os.chdir(git_erepo._saved_dir)
-    yield git_erepo
 
+    os.chdir(empty_dir._root_dir)
+
+    caplog.clear()
+    imported_file = "foo_imported"
+    with caplog.at_level(logging.INFO, logger="dvc"):
+        Repo.get(git_erepo._root_dir, "foo", out=imported_file, rev=dvc_branch)
 
-def test_get_from_non_dvc_master(empty_dir, erepo_no_dvc_master):
-    Repo.get(
-        erepo_no_dvc_master._root_dir,
-        "foo",
-        out="foo",
-        rev=erepo_no_dvc_master.dvc_branch,
+    assert caplog.text == ""
+    assert filecmp.cmp(
+        os.path.join(git_erepo._root_dir, git_erepo.FOO),
+        imported_file,
+        shallow=False,
     )