From a033ec7a65b1397f83140e9dc73db023c851608e Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Sep 18 2017 12:34:45 +0000 Subject: Merge #697 `Fix the transitive dependency resolving to include only active modules.` --- diff --git a/module_build_service/pdc.py b/module_build_service/pdc.py index c1668fc..66fc7ad 100644 --- a/module_build_service/pdc.py +++ b/module_build_service/pdc.py @@ -127,6 +127,9 @@ def get_variant_dict(data): if 'release' in data: result['variant_release'] = data['release'] + if 'active' in data: + result['active'] = data['active'] + if not result: raise ValueError("Couldn't get variant_dict from %s" % data) diff --git a/tests/test_pdc.py b/tests/test_pdc.py index e262916..8a779df 100644 --- a/tests/test_pdc.py +++ b/tests/test_pdc.py @@ -51,6 +51,24 @@ class TestPDCModule(unittest.TestCase): def tearDown(self): self.vcr.__exit__() + def test_get_variant_dict_module_dict_active(self): + """ + Tests that "active" is honored by get_variant_dict(...). + """ + dep = { + 'name': "platform", + 'version': "master", + 'active': True, + } + expected = { + 'active': True, + 'variant_id': 'platform', + 'variant_version': 'master' + } + + variant_dict = mbs_pdc.get_variant_dict(dep) + self.assertEqual(variant_dict, expected) + def test_get_module_simple_as_dict(self): query = {'name': 'testmodule', 'version': 'master'} result = mbs_pdc.get_module(self.pdc, query) diff --git a/tests/vcr-request-data.tar.gz b/tests/vcr-request-data.tar.gz index 1acbeb8..122d31b 100644 Binary files a/tests/vcr-request-data.tar.gz and b/tests/vcr-request-data.tar.gz differ