zuul
/
zuul
Code Issues Proposed changes

Re-enable TestMergerRepo() class for testing 

Update the unit test to use the new tenant_config_file for zuulv3.

Change-Id: I5fc2f56647b3e6e05f68607c584d8f594f24aeee
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-11-13 19:00:23 -05:00
parent debd7a7dbe
commit 83481b360c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_merger_repo.py
View File

@ -31,14 +31,12 @@ logging.basicConfig(level=logging.DEBUG,
class TestMergerRepo(ZuulTestCase):
log = logging.getLogger("zuul.test.merger.repo")
tenant_config_file = 'config/single-tenant/main.yaml'
workspace_root = None
def setUp(self):
self.skip("Disabled for early v3 development")
# def setUp(self):
# super(TestMergerRepo, self).setUp()
# self.workspace_root = os.path.join(self.test_root, 'workspace')
super(TestMergerRepo, self).setUp()
self.workspace_root = os.path.join(self.test_root, 'workspace')
def test_ensure_cloned(self):
parent_path = os.path.join(self.upstream_root, 'org/project1')