openstack
/
os-collect-config
Code Issues Proposed changes

Add .gitreview defaultbranch to fix issue with duplicate tags 

As described in related bug the last three tags 13.0.0 wallaby
12.0.0 victoria and 11.0.2 Ussuri were pointing to the same commit.
This creates a new commit so we can tag that instead.

Updates test-requirements to fix issue seen at [1] and then fixes
pep8 issues seen after that.

[1] https://zuul.opendev.org/t/openstack/build/3b0b61736bf94ec9bea0e25ba72b709f
Related-Bug: 1918311

Change-Id: I2a8af7edff3bdc16053e04734672bdc429872568
This commit is contained in:
Marios Andreou 2021-03-10 14:46:45 +02:00
parent cc519a7d48
commit 5bca5eadf2
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitreview
View File

@ -2,3 +2,4 @@
host=review.opendev.org
port=29418
project=openstack/os-collect-config.git
defaultbranch=stable/ussuri

4
os_collect_config/cfn.py
View File

@ -64,8 +64,8 @@ class Collector(object):
def collect(self):
if CONF.cfn.metadata_url is None:
if (CONF.cfn.heat_metadata_hint
and os.path.exists(CONF.cfn.heat_metadata_hint)):
if (CONF.cfn.heat_metadata_hint and os.path.exists(
CONF.cfn.heat_metadata_hint)):
with open(CONF.cfn.heat_metadata_hint) as hint:
CONF.cfn.metadata_url = '%s/v1/' % hint.read().strip()
else:

2
os_collect_config/tests/test_config_drive.py
View File

@ -74,7 +74,7 @@ class TestConfigDrive(testtools.TestCase):
self.assertEqual(('foo', 'bar'), psv('foo=bar'))
self.assertEqual(('foo', 'bar=baz'), psv('foo=bar=baz'))
self.assertEqual(('foo', 'bar baz'), psv('foo=bar baz'))
self.assertEqual(('foo', 'bar baz'), psv('foo=bar\ baz'))
self.assertEqual(('foo', 'bar baz'), psv('foo=bar\ baz')) # noqa W605
self.assertEqual(('foo', ''), psv('foo='))
self.assertEqual((None, None), psv('foo'))
self.assertEqual((None, None), psv(None))

4
os_collect_config/tests/test_heat.py
View File

@ -156,8 +156,8 @@ class TestHeat(TestHeatBase):
# FIXME(yanyanhu): Temporary hack to deal with possible log
# level setting for urllib3.connectionpool.
self.assertTrue(
self.log.output == '' or
self.log.output == 'Starting new HTTP connection (1): 192.0.2.1\n')
self.log.output == '' or self.log.output == (
'Starting new HTTP connection (1): 192.0.2.1\n'))
def test_collect_heat_fail(self):
heat_collect = heat.Collector(

4
test-requirements.txt
View File

@ -1,8 +1,8 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
hacking>=3.0.1,<3.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
python-subunit>=1.0.0 # Apache-2.0/BSD
@ -10,4 +10,4 @@ sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
stestr>=2.0.0 # Apache-2.0
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=2.2.0 # MIT
pyflakes>=2.2.0
pyflakes