summaryrefslogtreecommitdiff
path: root/tests/cachekey
diff options
context:
space:
mode:
authorBenjamin Schubert <ben.c.schubert@gmail.com>2019-05-31 12:13:26 +0100
committerbst-marge-bot <marge-bot@buildstream.build>2019-06-06 14:33:59 +0000
commit09b0cf8a208c46440cdb4d59ef1388522f12857a (patch)
tree6dab6c64ac15465d20ef45a6ee3c562fc6e0baf9 /tests/cachekey
parent3660337905dada5ee6bd9419ff83b5a6819f6801 (diff)
downloadbuildstream-09b0cf8a208c46440cdb4d59ef1388522f12857a.tar.gz
test:utils/site: Consolidate Git environment variables in a single place
We have two different 'site' files that are redundant and both define some variables in BuildStream environment. Moving all the git related ones in a single place.
Diffstat (limited to 'tests/cachekey')
-rw-r--r--tests/cachekey/cachekey.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/cachekey/cachekey.py b/tests/cachekey/cachekey.py
index e34c9ff04..dc202a94e 100644
--- a/tests/cachekey/cachekey.py
+++ b/tests/cachekey/cachekey.py
@@ -45,10 +45,10 @@ import os
import pytest
from buildstream.testing.runcli import cli # pylint: disable=unused-import
-from buildstream.testing._utils.site import HAVE_BZR
+from buildstream.testing._utils.site import HAVE_BZR, HAVE_GIT
from buildstream.plugin import CoreWarnings
from buildstream import _yaml
-from tests.testutils.site import HAVE_GIT, IS_LINUX, MACHINE_ARCH
+from tests.testutils.site import IS_LINUX, MACHINE_ARCH
##############################################