From a6c52f566acfbff5b0f37158c0d33adf05d250e5 Mon Sep 17 00:00:00 2001 From: Joanna Wang Date: Thu, 3 Nov 2022 16:51:19 -0400 Subject: Set tracing to always on and save to .repo/TRACE_FILE. - add `--trace_to_stderr` option so stderr will include trace outputs and any other errors that get sent to stderr - while TRACE_FILE will only include trace outputs piggy-backing on: https://gerrit-review.googlesource.com/c/git-repo/+/349154 Change-Id: I3895a84de4b2784f17fac4325521cd5e72e645e2 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/350114 Reviewed-by: LaMont Jones Tested-by: Joanna Wang --- tests/test_git_config.py | 14 ++++++++++++++ tests/test_git_superproject.py | 2 ++ tests/test_manifest_xml.py | 2 ++ tests/test_project.py | 8 ++++++++ 4 files changed, 26 insertions(+) (limited to 'tests') diff --git a/tests/test_git_config.py b/tests/test_git_config.py index a4fad9ef..0df38430 100644 --- a/tests/test_git_config.py +++ b/tests/test_git_config.py @@ -19,6 +19,7 @@ import tempfile import unittest import git_config +import repo_trace def fixture(*paths): @@ -33,9 +34,16 @@ class GitConfigReadOnlyTests(unittest.TestCase): def setUp(self): """Create a GitConfig object using the test.gitconfig fixture. """ + + self.tempdirobj = tempfile.TemporaryDirectory(prefix='repo_tests') + repo_trace._TRACE_FILE = os.path.join(self.tempdirobj.name, 'TRACE_FILE_from_test') + config_fixture = fixture('test.gitconfig') self.config = git_config.GitConfig(config_fixture) + def tearDown(self): + self.tempdirobj.cleanup() + def test_GetString_with_empty_config_values(self): """ Test config entries with no value. @@ -109,9 +117,15 @@ class GitConfigReadWriteTests(unittest.TestCase): """Read/write tests of the GitConfig class.""" def setUp(self): + self.tempdirobj = tempfile.TemporaryDirectory(prefix='repo_tests') + repo_trace._TRACE_FILE = os.path.join(self.tempdirobj.name, 'TRACE_FILE_from_test') + self.tmpfile = tempfile.NamedTemporaryFile() self.config = self.get_config() + def tearDown(self): + self.tempdirobj.cleanup() + def get_config(self): """Get a new GitConfig instance.""" return git_config.GitConfig(self.tmpfile.name) diff --git a/tests/test_git_superproject.py b/tests/test_git_superproject.py index 0ad9b01d..0bb77185 100644 --- a/tests/test_git_superproject.py +++ b/tests/test_git_superproject.py @@ -24,6 +24,7 @@ from unittest import mock import git_superproject import git_trace2_event_log import manifest_xml +import repo_trace from test_manifest_xml import sort_attributes @@ -39,6 +40,7 @@ class SuperprojectTestCase(unittest.TestCase): """Set up superproject every time.""" self.tempdirobj = tempfile.TemporaryDirectory(prefix='repo_tests') self.tempdir = self.tempdirobj.name + repo_trace._TRACE_FILE = os.path.join(self.tempdir, 'TRACE_FILE_from_test') self.repodir = os.path.join(self.tempdir, '.repo') self.manifest_file = os.path.join( self.repodir, manifest_xml.MANIFEST_FILE_NAME) diff --git a/tests/test_manifest_xml.py b/tests/test_manifest_xml.py index 06328661..f92108e1 100644 --- a/tests/test_manifest_xml.py +++ b/tests/test_manifest_xml.py @@ -23,6 +23,7 @@ import xml.dom.minidom import error import manifest_xml +import repo_trace # Invalid paths that we don't want in the filesystem. @@ -93,6 +94,7 @@ class ManifestParseTestCase(unittest.TestCase): def setUp(self): self.tempdirobj = tempfile.TemporaryDirectory(prefix='repo_tests') self.tempdir = self.tempdirobj.name + repo_trace._TRACE_FILE = os.path.join(self.tempdir, 'TRACE_FILE_from_test') self.repodir = os.path.join(self.tempdir, '.repo') self.manifest_dir = os.path.join(self.repodir, 'manifests') self.manifest_file = os.path.join( diff --git a/tests/test_project.py b/tests/test_project.py index acd44ccc..5c600be7 100644 --- a/tests/test_project.py +++ b/tests/test_project.py @@ -26,6 +26,7 @@ import git_command import git_config import platform_utils import project +import repo_trace @contextlib.contextmanager @@ -64,6 +65,13 @@ class FakeProject(object): class ReviewableBranchTests(unittest.TestCase): """Check ReviewableBranch behavior.""" + def setUp(self): + self.tempdirobj = tempfile.TemporaryDirectory(prefix='repo_tests') + repo_trace._TRACE_FILE = os.path.join(self.tempdirobj.name, 'TRACE_FILE_from_test') + + def tearDown(self): + self.tempdirobj.cleanup() + def test_smoke(self): """A quick run through everything.""" with TempGitTree() as tempdir: -- cgit v1.2.3-54-g00ecf