Merge pull request #61 from ryan-rs/bug/ASC-1559/fix_version_file_breaking_change

ASC-1559 Fix Version File Lookup

Author: ryan-rs

pytest_rpc/__init__.py

@@ -9,4 +9,4 @@
 # ==============================================================================
 # Globals
 # ==============================================================================
-__version__ = '1.0.0'
+__version__ = '1.0.1-dev0'

pytest_rpc/fixtures.py

@@ -69,7 +69,8 @@ def openstack_properties():
         'private_key_path': '/root/.ssh/rpc_support',
         'security_group': 'rpc-support',
         'os_version_file_path': '/etc/openstack-release',
-        'os_version': "99.99.99",   # Indicates that the version is unset.
+        'os_version_ini_path': '/etc/openstack-release.ini',
+        'os_version': '99.99.99',   # Indicates that the version is unset.
         'os_version_major': 99,
         'os_version_minor': 99,
         'os_version_patch': 99,
@@ -78,15 +79,15 @@ def openstack_properties():
 
     # Retrieve OpenStack version information
     try:
-        os_version_file = ConfigParser()
-        os_version_file.read(unicode(os_properties['os_version_file_path']))
+        os_version_ini = ConfigParser()
+        os_version_ini.read(unicode(os_properties['os_version_ini_path']))
 
         # Extract OpenStack version semantics
         os_properties['os_version_codename'] = \
-            os_version_file.get('default', 'DISTRIB_CODENAME').replace('"', '')
+            os_version_ini.get('default', 'DISTRIB_CODENAME').replace('"', '')
         os_properties['os_version'] = \
-            os_version_file.get('default',
-                                'DISTRIB_RELEASE').replace('"', '').lstrip('r')
+            os_version_ini.get('default',
+                               'DISTRIB_RELEASE').replace('"', '').lstrip('r')
         os_properties['os_version_major'] = \
             int(semantic_regex.match(os_properties['os_version']).group(1))
         os_properties['os_version_minor'] = \

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.0
+current_version = 1.0.1-dev0
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?

setup.py

@@ -27,7 +27,7 @@
 
 setup(
     name='pytest-rpc',
-    version='1.0.0',
+    version='1.0.1-dev0',
     author='rpc-automation',
     author_email='rpc-automation@rackspace.com',
     license='Apache Software License 2.0',

tests/helpers/test_parse_swift_recon.py

@@ -59,4 +59,4 @@ def test_garbage():
     result = pytest_rpc.helpers.parse_swift_recon(garbage)
 
     assert type(result) is list
-    assert len(result) is 0
+    assert len(result) == 0

tests/helpers/test_parse_swift_ring_builder.py

@@ -13,7 +13,7 @@ def test_empty():
     result = pytest_rpc.helpers.parse_swift_ring_builder(ring_str)
 
     assert type(result) is dict
-    assert len(result) is 0
+    assert len(result) == 0
 
 
 def test_expected_output():
@@ -68,4 +68,4 @@ def test_garbage():
     result = pytest_rpc.helpers.parse_swift_ring_builder(garbage)
 
     assert type(result) is dict
-    assert len(result) is 0
+    assert len(result) == 0