diff options
author | Julien Danjou <julien@danjou.info> | 2016-03-14 16:01:45 +0100 |
---|---|---|
committer | Julien Danjou <julien@danjou.info> | 2016-03-14 17:00:28 +0100 |
commit | edff3fca0ad1e84700d3b14f79103a03f501e3c3 (patch) | |
tree | 348d17f543e8d2cac6f760ec018028eabf8504b2 | |
parent | a1e30728dea7ac00e6a1f36504f8122e15f59d83 (diff) | |
download | ceilometer-edff3fca0ad1e84700d3b14f79103a03f501e3c3.tar.gz |
tests: remove ceilometer-api bin test cases
This removes these tests because they:
1. Depends on httplib2 which is being deprecated
2. Test running of `ceilometer-api' which is anyhow tested in the
devstack functional testing.
Closes-Bug: #1556985
Change-Id: Ic5fd445c651e28a37ee3ec72fbb0894486af6be6
-rw-r--r-- | ceilometer/tests/functional/test_bin.py | 118 | ||||
-rw-r--r-- | test-requirements.txt | 1 |
2 files changed, 0 insertions, 119 deletions
diff --git a/ceilometer/tests/functional/test_bin.py b/ceilometer/tests/functional/test_bin.py index df9bc279..3339922b 100644 --- a/ceilometer/tests/functional/test_bin.py +++ b/ceilometer/tests/functional/test_bin.py @@ -12,14 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -import json import os -import random -import socket import subprocess -import time -import httplib2 from oslo_utils import fileutils import six @@ -115,119 +110,6 @@ class BinSendSampleTestCase(base.BaseTestCase): self.assertEqual(0, subp.wait()) -class BinApiTestCase(base.BaseTestCase): - - def setUp(self): - super(BinApiTestCase, self).setUp() - # create api_paste.ini file without authentication - content = ("[pipeline:main]\n" - "pipeline = api-server\n" - "[app:api-server]\n" - "paste.app_factory = ceilometer.api.app:app_factory\n") - if six.PY3: - content = content.encode('utf-8') - self.paste = fileutils.write_to_tempfile(content=content, - prefix='api_paste', - suffix='.ini') - - # create ceilometer.conf file - self.api_port = random.randint(10000, 11000) - self.http = httplib2.Http(proxy_info=None) - self.pipeline_cfg_file = self.path_get('etc/ceilometer/pipeline.yaml') - self.policy_file = self.path_get('etc/ceilometer/policy.json') - - def tearDown(self): - super(BinApiTestCase, self).tearDown() - try: - self.subp.kill() - self.subp.wait() - except OSError: - pass - os.remove(self.tempfile) - - def get_response(self, path): - url = 'http://%s:%d/%s' % ('127.0.0.1', self.api_port, path) - - for x in range(10): - try: - r, c = self.http.request(url, 'GET') - except socket.error: - time.sleep(.5) - self.assertIsNone(self.subp.poll()) - else: - return r, c - return None, None - - def run_api(self, content, err_pipe=None): - if six.PY3: - content = content.encode('utf-8') - - self.tempfile = fileutils.write_to_tempfile(content=content, - prefix='ceilometer', - suffix='.conf') - if err_pipe: - return subprocess.Popen(['ceilometer-api', - "--config-file=%s" % self.tempfile], - stderr=subprocess.PIPE) - else: - return subprocess.Popen(['ceilometer-api', - "--config-file=%s" % self.tempfile]) - - def test_v2(self): - - content = ("[DEFAULT]\n" - "rpc_backend=fake\n" - "auth_strategy=noauth\n" - "debug=true\n" - "pipeline_cfg_file={0}\n" - "api_paste_config={2}\n" - "[api]\n" - "port={3}\n" - "[oslo_policy]\n" - "policy_file={1}\n" - "[database]\n" - "connection=log://localhost\n". - format(self.pipeline_cfg_file, - self.policy_file, - self.paste, - self.api_port)) - - self.subp = self.run_api(content) - - response, content = self.get_response('v2/meters') - self.assertEqual(200, response.status) - if six.PY3: - content = content.decode('utf-8') - self.assertEqual([], json.loads(content)) - - def test_v2_with_all_bad_conns(self): - - content = ("[DEFAULT]\n" - "rpc_backend=fake\n" - "auth_strategy=noauth\n" - "debug=true\n" - "pipeline_cfg_file={0}\n" - "policy_file={1}\n" - "api_paste_config={2}\n" - "[api]\n" - "port={3}\n" - "[database]\n" - "max_retries=1\n" - "connection=dummy://localhost\n" - "event_connection=dummy://localhost\n". - format(self.pipeline_cfg_file, - self.policy_file, - self.paste, - self.api_port)) - - self.subp = self.run_api(content, err_pipe=True) - - __, err = self.subp.communicate() - - self.assertIn(b"Api failed to start. Failed to connect to" - b" databases, purpose: metering, event", err) - - class BinCeilometerPollingServiceTestCase(base.BaseTestCase): def setUp(self): super(BinCeilometerPollingServiceTestCase, self).setUp() diff --git a/test-requirements.txt b/test-requirements.txt index b9c29eb1..6ffbce04 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,7 +10,6 @@ coverage>=3.6 # Apache-2.0 elasticsearch<2.0,>=1.3.0 # Apache-2.0 fixtures>=1.3.1 # Apache-2.0/BSD happybase!=0.7,>=0.5;python_version=='2.7' # MIT -httplib2>=0.7.5 # MIT mock>=1.2 # BSD PyMySQL>=0.6.2 # MIT License os-win>=0.2.3 # Apache-2.0 |