diff options
| author | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-05-31 10:28:31 +0100 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-06-06 14:33:59 +0000 |
| commit | 3660337905dada5ee6bd9419ff83b5a6819f6801 (patch) | |
| tree | 83c1b1d6bad61138a660a6b3a6b501cdbe1c2648 /tests/testutils/repo | |
| parent | 17da93ab01cf538fc855492b621916eb32bbf77d (diff) | |
| download | buildstream-3660337905dada5ee6bd9419ff83b5a6819f6801.tar.gz | |
test:utils/site: Consolidate Bzr environment variables in a single place
We have two different 'site' files that are redundant and both define
some variables in BuildStream environment.
This is a first step in consolidating them in a single file
Diffstat (limited to 'tests/testutils/repo')
| -rw-r--r-- | tests/testutils/repo/bzr.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/testutils/repo/bzr.py b/tests/testutils/repo/bzr.py index 53bacad17..8b2f17844 100644 --- a/tests/testutils/repo/bzr.py +++ b/tests/testutils/repo/bzr.py @@ -3,21 +3,16 @@ import subprocess import pytest from buildstream.testing import Repo -from .. import site - - -BZR_ENV = { - "BZR_EMAIL": "Testy McTesterson <testy.mctesterson@example.com>" -} +from buildstream.testing._utils.site import BZR, BZR_ENV, HAVE_BZR class Bzr(Repo): def __init__(self, directory, subdir): - if not site.HAVE_BZR: + if not HAVE_BZR: pytest.skip("bzr is not available") super(Bzr, self).__init__(directory, subdir) - self.bzr = site.BZR + self.bzr = BZR def create(self, directory): branch_dir = os.path.join(self.repo, 'trunk') |