Merge branch 'integration' into mediaComponentConfig

clmctest/streaming/__init__.py

+#!/usr/bin/python3
\ No newline at end of file

test/streaming/conftest.py → clmctest/streaming/conftest.py

@@ -2,17 +2,19 @@
 
 import pytest
 import yaml
+import pkg_resources
 
-
-@pytest.fixture(scope="module", params=[{'config': {'rspec': '/vagrant/test/streaming/rspec.yml'}}])
-def streaming_config(request):
+@pytest.fixture(scope="module")
+def streaming_config():
     """
     Reads the service configuration deployed for the streaming simulation test.
 
     :param request: access the parameters of the fixture
     :return: the python object representing the read YAML file
     """
+    rspec = pkg_resources.resource_filename('clmctest.streaming', 'rspec.yml')
+    print("rspec file: {0}".format(rspec))
 
-    with open(request.param['config']['rspec'], 'r') as stream:
+    with open(rspec, 'r') as stream:
         data_loaded = yaml.load(stream)
     return data_loaded

setup.py

+import os
+from setuptools import setup, find_packages
+
+def read(fname):
+    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+setup(
+    name = "clmctest",
+    #version = read('.build-config/git-commit-version'),
+    version = "SNAPSHOT",
+    author = "Michael Boniface",
+    author_email = "mjb@it-innovation.soton.ac.uk",
+    description = "FLAME CLMC Testing Module",
+    license = "license",
+    keywords = "example documentation",
+    url = "http://packages.python.org/an_example_pypi_project",
+    packages=find_packages(exclude=["services"]),
+    include_package_data=True,
+    package_data={'': ['*.yml', '*.sh']},        
+    long_description="long description",
+    classifiers=[
+        "Development Status :: Alpha",
+        "Topic :: FLAME Tests",
+        "License :: ",
+    ],
+)
\ No newline at end of file